diff --git a/.github/workflows/sdk.yml b/.github/workflows/sdk.yml
index 4488364..daf0576 100644
--- a/.github/workflows/sdk.yml
+++ b/.github/workflows/sdk.yml
@@ -1,4 +1,4 @@
-name: Build SDK
+name: CI
 
 on:
   push:
@@ -23,40 +23,24 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
 
-    - name: Setup SDK
+    - name: Setup
       run: |
         sudo apt update
-        sudo apt install bash cmake clang-15 lld-15
-        make
-        make DESTDIR=${{ runner.tool_cache }}/ps5-payload-sdk install
-        echo PS5_PAYLOAD_SDK=${{ runner.tool_cache }}/ps5-payload-sdk >> $GITHUB_ENV
-        echo PS5_HOST=ps5 >> $GITHUB_ENV
-        echo PS5_PORT=9020 >> $GITHUB_ENV
-        tar -zcf ps5-payload-sdk.tar.gz -C ${{ runner.tool_cache }}/ps5-payload-sdk .
+        sudo apt install bash socat cmake pkg-config clang-15 lld-15
 
     - name: Build
       run: |
-        make -C samples/arbitrary_syscall
-        make -C samples/browser
-        make -C samples/hello_sprx
-        make -C samples/hello_stdio
-        make -C samples/hello_world
-        make -C samples/hwinfo
-        make -C samples/list_files
-        make -C samples/mntinfo
-        make -C samples/ps
-        bash samples/hello_cmake/build.sh
+        make
+        make DESTDIR=${{ runner.tool_cache }}/ps5-payload-sdk install
+        tar -zcf ps5-payload-sdk.tar.gz -C ${{ runner.tool_cache }}/ps5-payload-sdk .
 
-    - name: Upload SDK
+    - name: Test
+      run: bash ci.sh
+
+    - name: Upload
       uses: actions/upload-artifact@v3
       with:
         name: SDK
         path: ./ps5-payload-sdk.tar.gz
         if-no-files-found: error
 
-    - name: Upload payload
-      uses: actions/upload-artifact@v3
-      with:
-        name: Payload binaries
-        path: ./**/*.elf
-        if-no-files-found: error
diff --git a/Makefile b/Makefile
index 51faf67..1e54be8 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ MAKE    ?= make
 DESTDIR ?= /opt/ps5-payload-sdk
 
 TOPTARGETS := all clean install
-SUBDIRS    := crt sce_stubs host
+SUBDIRS    := crt sce_stubs include host
 
 $(TOPTARGETS): $(SUBDIRS)
 
@@ -27,21 +27,5 @@ $(SUBDIRS):
 
 .PHONY: $(TOPTARGETS) $(SUBDIRS)
 
-install: elf_x86_64.x toolchain.cmake toolchain.mk toolchain.sh
-	install -d $(DESTDIR)/ldscripts
-	install elf_x86_64.x $(DESTDIR)/ldscripts
-
-	install -d $(DESTDIR)/cmake
-	install toolchain.cmake $(DESTDIR)/cmake
-
-	install -d $(DESTDIR)/make
-	install toolchain.mk $(DESTDIR)/make
-
-	install -d $(DESTDIR)/shell
-	install toolchain.sh $(DESTDIR)/shell
-
-	cp -r include_bsd/. $(DESTDIR)/sysroot/usr/include
-	cp -r include_ps5/. $(DESTDIR)/sysroot/usr/include/ps5
-	cp -r include_khronos/. $(DESTDIR)/sysroot/usr/include
-
+install:
 	cp -r samples/. $(DESTDIR)/samples
diff --git a/ci.sh b/ci.sh
index a3de652..f3275b3 100755
--- a/ci.sh
+++ b/ci.sh
@@ -15,10 +15,14 @@
 # along with this program; see the file COPYING. If not see
 # <http://www.gnu.org/licenses/>.
 
+SCRIPTDIR="${BASH_SOURCE[0]}"
+SCRIPTDIR="$(dirname "${SCRIPTDIR}")"
+
 export DESTDIR=$(mktemp -d)
 trap 'rm -rf -- "$DESTDIR"' EXIT
 
 make clean install || exit 1
+export PS5_PAYLOAD_SDK=$DESTDIR
 
 MAKE_SAMPLES=("arbitrary_syscall"
 	      "browser"
@@ -33,15 +37,15 @@ MAKE_SAMPLES=("arbitrary_syscall"
 CMAKE_SAMPLES=("hello_cmake"
 	      )
 
-export PS5_PAYLOAD_SDK=$DESTDIR
+source $PS5_PAYLOAD_SDK/toolchain/prospero.sh
 
 for SAMPLE in "${MAKE_SAMPLES[@]}"; do
-    make -C samples/$SAMPLE clean all || exit 1
+    ${MAKE} -C $PS5_PAYLOAD_SDK/samples/$SAMPLE clean all || exit 1
 done
 
 for SAMPLE in "${CMAKE_SAMPLES[@]}"; do
-    cmake -B $DESTDIR/build/$SAMPLE \
-	  -DCMAKE_TOOLCHAIN_FILE=$PS5_PAYLOAD_SDK/cmake/toolchain.cmake \
-	  samples/$SAMPLE || exit 1
-    make  -C $DESTDIR/build/$SAMPLE clean all || exit 1
+    ${CMAKE} \
+	-B $PS5_PAYLOAD_SDK/build/$SAMPLE \
+	-S $SCRIPTDIR/samples/$SAMPLE || exit 1
+    ${MAKE} -C $PS5_PAYLOAD_SDK/build/$SAMPLE clean all
 done
diff --git a/crt/Makefile b/crt/Makefile
index 1a393fb..6068838 100644
--- a/crt/Makefile
+++ b/crt/Makefile
@@ -16,14 +16,14 @@
 
 DESTDIR ?= /opt/ps5-payload-sdk
 
-CCS := clang-18 clang-17 clang-16 clang-15
+CCS := clang-18 clang-17 clang-16 clang-15 clang
 CCS := $(foreach CC,$(CCS),$(if $(shell command -v $(CC) 2> /dev/null),$(CC)))
 CC  := $(firstword $(CCS))
 ifndef CC
     $(error No suitable compiler found)
 endif
 
-LDS := ld.lld-18 ld.lld-17 ld.lld-16 ld.lld-15
+LDS := ld.lld-18 ld.lld-17 ld.lld-16 ld.lld-15 ld.lld
 LDS := $(foreach LD,$(LDS),$(if $(shell command -v $(LD) 2> /dev/null),$(LD)))
 LD  := $(firstword $(LDS))
 ifndef CC
@@ -46,5 +46,5 @@ clean:
 	rm -f *.o
 
 install: crt1.o
-	install -d $(DESTDIR)/sysroot/usr/lib
-	install $^ $(DESTDIR)/sysroot/usr/lib
+	install -d $(DESTDIR)/target/lib
+	install $^ $(DESTDIR)/target/lib
diff --git a/host/Makefile b/host/Makefile
index f95374b..e8f8882 100644
--- a/host/Makefile
+++ b/host/Makefile
@@ -16,22 +16,47 @@
 
 DESTDIR ?= /opt/ps5-payload-sdk
 
-TOOLS   := prospero-clang \
-	   prospero-clang++ \
-	   prospero-lld \
-	   prospero-objcopy \
-	   prospero-ranlib \
-	   prospero-ar \
-	   prospero-nm \
-	   prospero-strip \
-	   prospero-pkg-config \
-	   prospero-cmake \
-	   prospero-deploy
+TOOLCHAINS := toolchain/prospero.sh \
+              toolchain/prospero.mk \
+              toolchain/prospero.cmake
+
+TOOLS := bin/cmake-bin-wrapper \
+         bin/llvm-bin-wrapper \
+         bin/llvm-config \
+         bin/prospero-clang \
+         bin/prospero-clang++ \
+         bin/prospero-deploy \
+         bin/prospero-lld \
+         bin/prospero-pkg-config
+
+LDSCRIPTS := elf_x86_64.x
 
 all:
 
 clean:
 
-install: $(TOOLS)
+install: install-tools install-symlinks install-ldscripts install-toolchains
+
+install-ldscripts: $(LDSCRIPTS)
+	install -d $(DESTDIR)/ldscripts
+	install $^ $(DESTDIR)/ldscripts
+
+install-toolchains: $(TOOLCHAINS)
+	install -d $(DESTDIR)/toolchain
+	install $^ $(DESTDIR)/toolchain
+
+install-tools: $(TOOLS)
 	install -d $(DESTDIR)/bin
 	install $^ $(DESTDIR)/bin
+
+install-symlinks:
+	ln -sf llvm-bin-wrapper $(DESTDIR)/bin/llvm-ar
+	ln -sf llvm-bin-wrapper $(DESTDIR)/bin/llvm-nm
+	ln -sf llvm-bin-wrapper $(DESTDIR)/bin/llvm-objcopy
+	ln -sf llvm-bin-wrapper $(DESTDIR)/bin/llvm-ranlib
+	ln -sf llvm-bin-wrapper $(DESTDIR)/bin/llvm-strip
+	ln -sf llvm-bin-wrapper $(DESTDIR)/bin/clang
+	ln -sf llvm-bin-wrapper $(DESTDIR)/bin/clang++
+	ln -sf llvm-bin-wrapper $(DESTDIR)/bin/clang-cpp
+	ln -sf llvm-bin-wrapper $(DESTDIR)/bin/ld.lld
+	ln -sf cmake-bin-wrapper $(DESTDIR)/bin/prospero-cmake
diff --git a/host/prospero-cmake b/host/bin/cmake-bin-wrapper
old mode 100755
new mode 100644
similarity index 72%
rename from host/prospero-cmake
rename to host/bin/cmake-bin-wrapper
index d02f817..5bcf3fe
--- a/host/prospero-cmake
+++ b/host/bin/cmake-bin-wrapper
@@ -15,8 +15,12 @@
 # along with this program; see the file COPYING. If not see
 # <http://www.gnu.org/licenses/>.
 
-PS5_PAYLOAD_SDK="${BASH_SOURCE[0]}"
-PS5_PAYLOAD_SDK="$(dirname "${PS5_PAYLOAD_SDK}")"
-PS5_PAYLOAD_SDK="${PS5_PAYLOAD_SDK}/.."
+SCRIPT_PATH="${BASH_SOURCE[0]}"
+SCRIPT_NAME="$(basename "${SCRIPT_PATH}")"
+SCRIPT_DIR="$(dirname "${SCRIPT_PATH}")"
 
-exec cmake -DCMAKE_TOOLCHAIN_FILE=${PS5_PAYLOAD_SDK}/cmake/toolchain.cmake "$@"
+PS5_PAYLOAD_SDK="${SCRIPT_DIR}/.."
+TOOLCHAIN="${SCRIPT_NAME::-6}"
+
+exec cmake \
+  -DCMAKE_TOOLCHAIN_FILE="${SCRIPT_DIR}/../toolchain/${TOOLCHAIN}.cmake" "$@"
diff --git a/host/bin/llvm-bin-wrapper b/host/bin/llvm-bin-wrapper
new file mode 100755
index 0000000..c6e3a0c
--- /dev/null
+++ b/host/bin/llvm-bin-wrapper
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+#   Copyright (C) 2024 John Törnblom
+#
+# This file 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 3 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; see the file COPYING. If not see
+# <http://www.gnu.org/licenses/>.
+
+SCRIPT_PATH="${BASH_SOURCE[0]}"
+SCRIPT_NAME="$(basename "${SCRIPT_PATH}")"
+SCRIPT_DIR="$(dirname "${SCRIPT_PATH}")"
+
+LLVM_CONFIG="${SCRIPT_DIR}/llvm-config"
+LLVM_BINDIR=$("${LLVM_CONFIG}" --bindir)
+
+BIN_PATH="${LLVM_BINDIR}/${SCRIPT_NAME}"
+if [ -f "${BIN_PATH}" ]; then
+    exec "${BIN_PATH}" "$@"
+fi
+
+BIN_NAME=$(echo $SCRIPT_NAME | rev | cut -d'-' -f1 | rev)
+BIN_PATH="${LLVM_BINDIR}/${BIN_NAME}"
+exec -a "${SCRIPT_NAME}" "${BIN_PATH}" "$@"
diff --git a/host/prospero-ar b/host/bin/llvm-config
similarity index 69%
rename from host/prospero-ar
rename to host/bin/llvm-config
index 54db5bd..e7a2840 100755
--- a/host/prospero-ar
+++ b/host/bin/llvm-config
@@ -15,18 +15,18 @@
 # along with this program; see the file COPYING. If not see
 # <http://www.gnu.org/licenses/>.
 
-PS5_PAYLOAD_SDK="${BASH_SOURCE[0]}"
-PS5_PAYLOAD_SDK="$(dirname "${PS5_PAYLOAD_SDK}")"
-PS5_PAYLOAD_SDK="${PS5_PAYLOAD_SDK}/.."
+if [ -x "$(command -v "${LLVM_CONFIG}")" ]; then
+    exec "${LLVM_CONFIG}"
+fi
 
-CANDIDATES=("llvm-ar-18"
-	    "llvm-ar-17"
-            "llvm-ar-16"
-            "llvm-ar-15")
+CANDIDATES=("llvm-config-18"
+            "llvm-config-17"
+            "llvm-config-16"
+            "llvm-config-15")
 
-for AR in "${CANDIDATES[@]}"; do
-    if [ -x "$(command -v $AR)" ]; then
-	exec $AR $*
+for LLVM_CONFIG in "${CANDIDATES[@]}"; do
+    if [ -x "$(command -v "${LLVM_CONFIG}")" ]; then
+	exec "${LLVM_CONFIG}" "$@"
     fi
 done
 
diff --git a/host/prospero-objcopy b/host/bin/prospero-clang
similarity index 65%
rename from host/prospero-objcopy
rename to host/bin/prospero-clang
index 04f10f1..9038f50 100755
--- a/host/prospero-objcopy
+++ b/host/bin/prospero-clang
@@ -15,19 +15,17 @@
 # along with this program; see the file COPYING. If not see
 # <http://www.gnu.org/licenses/>.
 
-PS5_PAYLOAD_SDK="${BASH_SOURCE[0]}"
-PS5_PAYLOAD_SDK="$(dirname "${PS5_PAYLOAD_SDK}")"
-PS5_PAYLOAD_SDK="${PS5_PAYLOAD_SDK}/.."
+SCRIPT_PATH="${BASH_SOURCE[0]}"
+SCRIPT_NAME="$(basename "${SCRIPT_PATH}")"
+SCRIPT_DIR="$(dirname "${SCRIPT_PATH}")"
 
-CANDIDATES=("llvm-objcopy-18"
-	    "llvm-objcopy-17"
-            "llvm-objcopy-16"
-            "llvm-objcopy-15")
+PS5_PAYLOAD_SDK="${SCRIPT_DIR}/.."
 
-for OBJCOPY in "${CANDIDATES[@]}"; do
-    if [ -x "$(command -v $OBJCOPY)" ]; then
-	exec $OBJCOPY $*
-    fi
-done
+# ensure clang knows where prospero-lld is at
+export PATH=${SCRIPT_DIR}:$PATH
 
-exit 1
+exec -a "${SCRIPT_NAME}" "${SCRIPT_DIR}/clang" \
+     -target x86_64-sie-ps5 \
+     -isysroot "${PS5_PAYLOAD_SDK}" \
+     -fno-stack-protector -fno-plt \
+     "$@"
diff --git a/host/prospero-nm b/host/bin/prospero-clang++
similarity index 64%
rename from host/prospero-nm
rename to host/bin/prospero-clang++
index 33fa4d0..8170059 100755
--- a/host/prospero-nm
+++ b/host/bin/prospero-clang++
@@ -15,19 +15,17 @@
 # along with this program; see the file COPYING. If not see
 # <http://www.gnu.org/licenses/>.
 
-PS5_PAYLOAD_SDK="${BASH_SOURCE[0]}"
-PS5_PAYLOAD_SDK="$(dirname "${PS5_PAYLOAD_SDK}")"
-PS5_PAYLOAD_SDK="${PS5_PAYLOAD_SDK}/.."
+SCRIPT_PATH="${BASH_SOURCE[0]}"
+SCRIPT_NAME="$(basename "${SCRIPT_PATH}")"
+SCRIPT_DIR="$(dirname "${SCRIPT_PATH}")"
 
-CANDIDATES=("llvm-nm-18"
-	    "llvm-nm-17"
-            "llvm-nm-16"
-            "llvm-nm-15")
+PS5_PAYLOAD_SDK="${SCRIPT_DIR}/.."
 
-for NM in "${CANDIDATES[@]}"; do
-    if [ -x "$(command -v $NM)" ]; then
-	exec $NM $*
-    fi
-done
+# ensure clang++ knows where prospero-lld is at
+export PATH=${SCRIPT_DIR}:$PATH
 
-exit 1
+exec -a "${SCRIPT_NAME}" "${SCRIPT_DIR}/clang++" \
+     -target x86_64-sie-ps5 \
+     -isysroot "${PS5_PAYLOAD_SDK}" \
+     -fno-stack-protector -fno-plt \
+     "$@"
diff --git a/host/prospero-deploy b/host/bin/prospero-deploy
similarity index 100%
rename from host/prospero-deploy
rename to host/bin/prospero-deploy
diff --git a/host/prospero-lld b/host/bin/prospero-lld
similarity index 56%
rename from host/prospero-lld
rename to host/bin/prospero-lld
index f42adc5..5276dff 100755
--- a/host/prospero-lld
+++ b/host/bin/prospero-lld
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-#   Copyright (C) 2023 John Törnblom
+#   Copyright (C) 2024 John Törnblom
 #
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -15,9 +15,15 @@
 # along with this program; see the file COPYING. If not see
 # <http://www.gnu.org/licenses/>.
 
-PS5_PAYLOAD_SDK="${BASH_SOURCE[0]}"
-PS5_PAYLOAD_SDK="$(dirname "${PS5_PAYLOAD_SDK}")"
-PS5_PAYLOAD_SDK="${PS5_PAYLOAD_SDK}/.."
+SCRIPT_PATH="${BASH_SOURCE[0]}"
+SCRIPT_NAME="$(basename "${SCRIPT_PATH}")"
+SCRIPT_DIR="$(dirname "${SCRIPT_PATH}")"
+
+PS5_PAYLOAD_SDK="${SCRIPT_DIR}/.."
+
+LLVM_CONFIG="${SCRIPT_DIR}/llvm-config"
+LLVM_BINDIR=$("${LLVM_CONFIG}" --bindir)
+
 
 LIBKERNEL=-lkernel_web
 for ARG in "$@"; do
@@ -26,21 +32,11 @@ for ARG in "$@"; do
     fi
 done
 
-CANDIDATES=("ld.lld-18"
-	    "ld.lld-17"
-            "ld.lld-16"
-            "ld.lld-15")
-
-for LD in "${CANDIDATES[@]}"; do
-    if [ -x "$(command -v $LD)" ]; then
-	exec $LD \
-	     -pie \
-	     -z max-page-size=0x4000 \
-	     -T "${PS5_PAYLOAD_SDK}/ldscripts/elf_x86_64.x" \
-	     -L "${PS5_PAYLOAD_SDK}/sysroot/usr/lib" \
-	     -lScePosixForWebKit -lSceLibcInternal "${LIBKERNEL}" $* \
-	     "${PS5_PAYLOAD_SDK}/sysroot/usr/lib/crt1.o"
-    fi
-done
-
-exit 1
+BIN_PATH="${LLVM_BINDIR}/ld.lld"
+exec "${BIN_PATH}" \
+     -pie \
+     -z max-page-size=0x4000 \
+     -T "${PS5_PAYLOAD_SDK}/ldscripts/elf_x86_64.x" \
+     -L "${PS5_PAYLOAD_SDK}/target/lib" \
+     -lScePosixForWebKit -lSceLibcInternal "${LIBKERNEL}" "$@" \
+     "${PS5_PAYLOAD_SDK}/target/lib/crt1.o"
diff --git a/host/prospero-pkg-config b/host/bin/prospero-pkg-config
similarity index 65%
rename from host/prospero-pkg-config
rename to host/bin/prospero-pkg-config
index f9c0d59..0d1e09d 100755
--- a/host/prospero-pkg-config
+++ b/host/bin/prospero-pkg-config
@@ -15,17 +15,15 @@
 # along with this program; see the file COPYING. If not see
 # <http://www.gnu.org/licenses/>.
 
-PS5_PAYLOAD_SDK="${BASH_SOURCE[0]}"
-PS5_PAYLOAD_SDK="$(dirname "${PS5_PAYLOAD_SDK}")"
-PS5_PAYLOAD_SDK="${PS5_PAYLOAD_SDK}/.."
+SCRIPT_PATH="${BASH_SOURCE[0]}"
+SCRIPT_NAME="$(basename "${SCRIPT_PATH}")"
+SCRIPT_DIR="$(dirname "${SCRIPT_PATH}")"
+
+PS5_PAYLOAD_SDK="${SCRIPT_DIR}/.."
 
 export PKG_CONFIG_DIR=
-export PKG_CONFIG_SYSROOT_DIR=
-export PKG_CONFIG_LIBDIR=${PS5_PAYLOAD_SDK}/sysroot/usr/lib/pkgconfig
-export PKG_CONFIG_PATH=${PS5_PAYLOAD_SDK}/sysroot/usr/libdata/pkgconfig
+export PKG_CONFIG_SYSROOT_DIR=${PS5_PAYLOAD_SDK}/target
+export PKG_CONFIG_LIBDIR=${PS5_PAYLOAD_SDK}/target/lib/pkgconfig
+export PKG_CONFIG_PATH=${PS5_PAYLOAD_SDK}/target/libdata/pkgconfig
 
-if [ -x "$(command -v pkg-config)" ]; then
-   exec pkg-config --static "$@"
-fi
-
-exit 1
+exec -a "${SCRIPT_NAME}" pkg-config --static "$@"
diff --git a/elf_x86_64.x b/host/elf_x86_64.x
similarity index 100%
rename from elf_x86_64.x
rename to host/elf_x86_64.x
diff --git a/host/prospero-clang b/host/prospero-clang
deleted file mode 100755
index 88f01cb..0000000
--- a/host/prospero-clang
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env bash
-#   Copyright (C) 2023 John Törnblom
-#
-# This file 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 3 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; see the file COPYING. If not see
-# <http://www.gnu.org/licenses/>.
-
-PS5_PAYLOAD_SDK="${BASH_SOURCE[0]}"
-PS5_PAYLOAD_SDK="$(dirname "${PS5_PAYLOAD_SDK}")"
-PS5_PAYLOAD_SDK="${PS5_PAYLOAD_SDK}/.."
-
-CANDIDATES=("clang-18"
-	    "clang-17"
-            "clang-16"
-            "clang-15")
-
-# ensure clang knows where prospero-lld is at
-export PATH=${PS5_PAYLOAD_SDK}/bin:$PATH
-
-for CC in "${CANDIDATES[@]}"; do
-    if [ -x "$(command -v $CC)" ]; then
-	exec $CC \
-	     -target x86_64-sie-ps5 \
-	     -isysroot ${PS5_PAYLOAD_SDK}/sysroot \
-	     -isystem ${PS5_PAYLOAD_SDK}/sysroot/usr/include \
-	     -fno-stack-protector -fno-plt \
-	     $*
-    fi
-done
-
-exit 1
diff --git a/host/prospero-clang++ b/host/prospero-clang++
deleted file mode 100755
index db82861..0000000
--- a/host/prospero-clang++
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env bash
-#   Copyright (C) 2023 John Törnblom
-#
-# This file 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 3 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; see the file COPYING. If not see
-# <http://www.gnu.org/licenses/>.
-
-PS5_PAYLOAD_SDK="${BASH_SOURCE[0]}"
-PS5_PAYLOAD_SDK="$(dirname "${PS5_PAYLOAD_SDK}")"
-PS5_PAYLOAD_SDK="${PS5_PAYLOAD_SDK}/.."
-
-CANDIDATES=("clang++-18"
-	    "clang++-17"
-            "clang++-16"
-            "clang++-15")
-
-
-# ensure clang++ knows where prospero-lld is at
-export PATH=${PS5_PAYLOAD_SDK}/bin:$PATH
-
-for CXX in "${CANDIDATES[@]}"; do
-    if [ -x "$(command -v $CXX)" ]; then
-	exec $CXX \
-	     -target x86_64-sie-ps5 \
-	     -isysroot ${PS5_PAYLOAD_SDK}/sysroot \
-	     -isystem ${PS5_PAYLOAD_SDK}/sysroot/usr/include \
-	     -fno-stack-protector -fno-plt \
-	     $*
-    fi
-done
-
-exit 1
diff --git a/host/prospero-ranlib b/host/prospero-ranlib
deleted file mode 100755
index b7096aa..0000000
--- a/host/prospero-ranlib
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-#   Copyright (C) 2024 John Törnblom
-#
-# This file 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 3 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; see the file COPYING. If not see
-# <http://www.gnu.org/licenses/>.
-
-PS5_PAYLOAD_SDK="${BASH_SOURCE[0]}"
-PS5_PAYLOAD_SDK="$(dirname "${PS5_PAYLOAD_SDK}")"
-PS5_PAYLOAD_SDK="${PS5_PAYLOAD_SDK}/.."
-
-CANDIDATES=("llvm-ranlib-18"
-	    "llvm-ranlib-17"
-            "llvm-ranlib-16"
-            "llvm-ranlib-15")
-
-for RANLIB in "${CANDIDATES[@]}"; do
-    if [ -x "$(command -v $RANLIB)" ]; then
-	exec $RANLIB $*
-    fi
-done
-
-exit 1
diff --git a/toolchain.cmake b/host/toolchain/prospero.cmake
similarity index 97%
rename from toolchain.cmake
rename to host/toolchain/prospero.cmake
index 6331b9f..ea37ec0 100644
--- a/toolchain.cmake
+++ b/host/toolchain/prospero.cmake
@@ -30,7 +30,7 @@ set(CMAKE_CROSSCOMPILING 1)
 #
 # Set sysroot and search paths
 #
-set(CMAKE_SYSROOT "${PS5_PAYLOAD_SDK}/sysroot")
+set(CMAKE_SYSROOT "${PS5_PAYLOAD_SDK}/target")
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
diff --git a/toolchain.mk b/host/toolchain/prospero.mk
similarity index 78%
rename from toolchain.mk
rename to host/toolchain/prospero.mk
index 98c2e34..9bc7be5 100644
--- a/toolchain.mk
+++ b/host/toolchain/prospero.mk
@@ -15,18 +15,18 @@
 # <http://www.gnu.org/licenses/>.
 
 PS5_PAYLOAD_SDK := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))..)
-PS5_SYSROOT     := $(PS5_PAYLOAD_SDK)/sysroot
+PS5_SYSROOT     := $(PS5_PAYLOAD_SDK)/target
 PS5_DEPLOY      := $(PS5_PAYLOAD_SDK)/bin/prospero-deploy
 
+AS         := $(PS5_PAYLOAD_SDK)/bin/prospero-clang
 CC         := $(PS5_PAYLOAD_SDK)/bin/prospero-clang
 CXX        := $(PS5_PAYLOAD_SDK)/bin/prospero-clang++
-AS         := $(PS5_PAYLOAD_SDK)/bin/prospero-clang
 LD         := $(PS5_PAYLOAD_SDK)/bin/prospero-lld
-AR         := $(PS5_PAYLOAD_SDK)/bin/prospero-ar
-NM         := $(PS5_PAYLOAD_SDK)/bin/prospero-nm
-OBJCOPY    := $(PS5_PAYLOAD_SDK)/bin/prospero-objcopy
-RANLIB     := $(PS5_PAYLOAD_SDK)/bin/prospero-ranlib
-STRIP      := $(PS5_PAYLOAD_SDK)/bin/prospero-strip
 PKG_CONFIG := $(PS5_PAYLOAD_SDK)/bin/prospero-pkg-config
+AR         := $(PS5_PAYLOAD_SDK)/bin/llvm-ar
+NM         := $(PS5_PAYLOAD_SDK)/bin/llvm-nm
+OBJCOPY    := $(PS5_PAYLOAD_SDK)/bin/llvm-objcopy
+RANLIB     := $(PS5_PAYLOAD_SDK)/bin/llvm-ranlib
+STRIP      := $(PS5_PAYLOAD_SDK)/bin/llvm-strip
 
 STRINGS := strings
diff --git a/toolchain.sh b/host/toolchain/prospero.sh
similarity index 81%
rename from toolchain.sh
rename to host/toolchain/prospero.sh
index f7bf5a7..7a59f74 100644
--- a/toolchain.sh
+++ b/host/toolchain/prospero.sh
@@ -21,20 +21,21 @@ PS5_PAYLOAD_SDK="${PS5_PAYLOAD_SDK}/.."
 PS5_PAYLOAD_SDK="$(realpath "${PS5_PAYLOAD_SDK}")"
 
 export PS5_PAYLOAD_SDK=${PS5_PAYLOAD_SDK}
-export PS5_SYSROOT=${PS5_PAYLOAD_SDK}/sysroot
+export PS5_SYSROOT=${PS5_PAYLOAD_SDK}/target
 export PS5_DEPLOY=${PS5_PAYLOAD_SDK}/bin/prospero-deploy
 
 export CC=${PS5_PAYLOAD_SDK}/bin/prospero-clang
 export CXX=${PS5_PAYLOAD_SDK}/bin/prospero-clang++
 export AS=${PS5_PAYLOAD_SDK}/bin/prospero-clang
 export LD=${PS5_PAYLOAD_SDK}/bin/prospero-ldd
-export AR=${PS5_PAYLOAD_SDK}/bin/prospero-ar
-export NM=${PS5_PAYLOAD_SDK}/bin/prospero-nm
-export OBJCOPY=${PS5_PAYLOAD_SDK}/bin/prospero-objcopy
-export RANLIB=${PS5_PAYLOAD_SDK}/bin/prospero-ranlib
-export STRIP=${PS5_PAYLOAD_SDK}/bin/prospero-strip
 export CMAKE=${PS5_PAYLOAD_SDK}/bin/prospero-cmake
 export PKG_CONFIG=${PS5_PAYLOAD_SDK}/bin/prospero-pkg-config
 
+export AR=${PS5_PAYLOAD_SDK}/bin/llvm-ar
+export NM=${PS5_PAYLOAD_SDK}/bin/llvm-nm
+export OBJCOPY=${PS5_PAYLOAD_SDK}/bin/llvm-objcopy
+export RANLIB=${PS5_PAYLOAD_SDK}/bin/llvm-ranlib
+export STRIP=${PS5_PAYLOAD_SDK}/bin/llvm-strip
+
 export STRINGS=strings
 export MAKE=make
diff --git a/host/prospero-strip b/include/Makefile
old mode 100755
new mode 100644
similarity index 61%
rename from host/prospero-strip
rename to include/Makefile
index ccd05b9..dbe6953
--- a/host/prospero-strip
+++ b/include/Makefile
@@ -1,5 +1,4 @@
-#!/usr/bin/env bash
-#   Copyright (C) 2024 John Törnblom
+#   Copyright (C) 2023 John Törnblom
 #
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -15,19 +14,14 @@
 # along with this program; see the file COPYING. If not see
 # <http://www.gnu.org/licenses/>.
 
-PS5_PAYLOAD_SDK="${BASH_SOURCE[0]}"
-PS5_PAYLOAD_SDK="$(dirname "${PS5_PAYLOAD_SDK}")"
-PS5_PAYLOAD_SDK="${PS5_PAYLOAD_SDK}/.."
+DESTDIR ?= /opt/ps5-payload-sdk
 
-CANDIDATES=("llvm-strip-18"
-	    "llvm-strip-17"
-            "llvm-strip-16"
-            "llvm-strip-15")
+all:
 
-for STRIP in "${CANDIDATES[@]}"; do
-    if [ -x "$(command -v $STRIP)" ]; then
-	exec $STRIP $*
-    fi
-done
+clean:
 
-exit 1
+install:
+	install -d $(DESTDIR)/target
+	cp -r freebsd/. $(DESTDIR)/target/include
+	cp -r khronos/. $(DESTDIR)/target/include
+	cp -r ps5/. $(DESTDIR)/target/include/ps5
diff --git a/include_bsd/Block.h b/include/freebsd/Block.h
similarity index 100%
rename from include_bsd/Block.h
rename to include/freebsd/Block.h
diff --git a/include_bsd/Block_private.h b/include/freebsd/Block_private.h
similarity index 100%
rename from include_bsd/Block_private.h
rename to include/freebsd/Block_private.h
diff --git a/include_bsd/FlexLexer.h b/include/freebsd/FlexLexer.h
similarity index 100%
rename from include_bsd/FlexLexer.h
rename to include/freebsd/FlexLexer.h
diff --git a/include_bsd/_ctype.h b/include/freebsd/_ctype.h
similarity index 100%
rename from include_bsd/_ctype.h
rename to include/freebsd/_ctype.h
diff --git a/include_bsd/_semaphore.h b/include/freebsd/_semaphore.h
similarity index 100%
rename from include_bsd/_semaphore.h
rename to include/freebsd/_semaphore.h
diff --git a/include_bsd/a.out.h b/include/freebsd/a.out.h
similarity index 100%
rename from include_bsd/a.out.h
rename to include/freebsd/a.out.h
diff --git a/include_bsd/aio.h b/include/freebsd/aio.h
similarity index 100%
rename from include_bsd/aio.h
rename to include/freebsd/aio.h
diff --git a/include_bsd/alias.h b/include/freebsd/alias.h
similarity index 100%
rename from include_bsd/alias.h
rename to include/freebsd/alias.h
diff --git a/include_bsd/ar.h b/include/freebsd/ar.h
similarity index 100%
rename from include_bsd/ar.h
rename to include/freebsd/ar.h
diff --git a/include_bsd/archive.h b/include/freebsd/archive.h
similarity index 100%
rename from include_bsd/archive.h
rename to include/freebsd/archive.h
diff --git a/include_bsd/archive_entry.h b/include/freebsd/archive_entry.h
similarity index 100%
rename from include_bsd/archive_entry.h
rename to include/freebsd/archive_entry.h
diff --git a/include_bsd/arpa/ftp.h b/include/freebsd/arpa/ftp.h
similarity index 100%
rename from include_bsd/arpa/ftp.h
rename to include/freebsd/arpa/ftp.h
diff --git a/include_bsd/arpa/inet.h b/include/freebsd/arpa/inet.h
similarity index 100%
rename from include_bsd/arpa/inet.h
rename to include/freebsd/arpa/inet.h
diff --git a/include_bsd/arpa/nameser.h b/include/freebsd/arpa/nameser.h
similarity index 100%
rename from include_bsd/arpa/nameser.h
rename to include/freebsd/arpa/nameser.h
diff --git a/include_bsd/arpa/nameser_compat.h b/include/freebsd/arpa/nameser_compat.h
similarity index 100%
rename from include_bsd/arpa/nameser_compat.h
rename to include/freebsd/arpa/nameser_compat.h
diff --git a/include_bsd/arpa/telnet.h b/include/freebsd/arpa/telnet.h
similarity index 100%
rename from include_bsd/arpa/telnet.h
rename to include/freebsd/arpa/telnet.h
diff --git a/include_bsd/arpa/tftp.h b/include/freebsd/arpa/tftp.h
similarity index 100%
rename from include_bsd/arpa/tftp.h
rename to include/freebsd/arpa/tftp.h
diff --git a/include_bsd/asn1-common.h b/include/freebsd/asn1-common.h
similarity index 100%
rename from include_bsd/asn1-common.h
rename to include/freebsd/asn1-common.h
diff --git a/include_bsd/asn1_err.h b/include/freebsd/asn1_err.h
similarity index 100%
rename from include_bsd/asn1_err.h
rename to include/freebsd/asn1_err.h
diff --git a/include_bsd/assert.h b/include/freebsd/assert.h
similarity index 100%
rename from include_bsd/assert.h
rename to include/freebsd/assert.h
diff --git a/include_bsd/atf-c++.hpp b/include/freebsd/atf-c++.hpp
similarity index 100%
rename from include_bsd/atf-c++.hpp
rename to include/freebsd/atf-c++.hpp
diff --git a/include_bsd/atf-c++/build.hpp b/include/freebsd/atf-c++/build.hpp
similarity index 100%
rename from include_bsd/atf-c++/build.hpp
rename to include/freebsd/atf-c++/build.hpp
diff --git a/include_bsd/atf-c++/check.hpp b/include/freebsd/atf-c++/check.hpp
similarity index 100%
rename from include_bsd/atf-c++/check.hpp
rename to include/freebsd/atf-c++/check.hpp
diff --git a/include_bsd/atf-c++/macros.hpp b/include/freebsd/atf-c++/macros.hpp
similarity index 100%
rename from include_bsd/atf-c++/macros.hpp
rename to include/freebsd/atf-c++/macros.hpp
diff --git a/include_bsd/atf-c++/tests.hpp b/include/freebsd/atf-c++/tests.hpp
similarity index 100%
rename from include_bsd/atf-c++/tests.hpp
rename to include/freebsd/atf-c++/tests.hpp
diff --git a/include_bsd/atf-c++/utils.hpp b/include/freebsd/atf-c++/utils.hpp
similarity index 100%
rename from include_bsd/atf-c++/utils.hpp
rename to include/freebsd/atf-c++/utils.hpp
diff --git a/include_bsd/atf-c.h b/include/freebsd/atf-c.h
similarity index 100%
rename from include_bsd/atf-c.h
rename to include/freebsd/atf-c.h
diff --git a/include_bsd/atf-c/build.h b/include/freebsd/atf-c/build.h
similarity index 100%
rename from include_bsd/atf-c/build.h
rename to include/freebsd/atf-c/build.h
diff --git a/include_bsd/atf-c/check.h b/include/freebsd/atf-c/check.h
similarity index 100%
rename from include_bsd/atf-c/check.h
rename to include/freebsd/atf-c/check.h
diff --git a/include_bsd/atf-c/defs.h b/include/freebsd/atf-c/defs.h
similarity index 100%
rename from include_bsd/atf-c/defs.h
rename to include/freebsd/atf-c/defs.h
diff --git a/include_bsd/atf-c/error.h b/include/freebsd/atf-c/error.h
similarity index 100%
rename from include_bsd/atf-c/error.h
rename to include/freebsd/atf-c/error.h
diff --git a/include_bsd/atf-c/error_fwd.h b/include/freebsd/atf-c/error_fwd.h
similarity index 100%
rename from include_bsd/atf-c/error_fwd.h
rename to include/freebsd/atf-c/error_fwd.h
diff --git a/include_bsd/atf-c/macros.h b/include/freebsd/atf-c/macros.h
similarity index 100%
rename from include_bsd/atf-c/macros.h
rename to include/freebsd/atf-c/macros.h
diff --git a/include_bsd/atf-c/tc.h b/include/freebsd/atf-c/tc.h
similarity index 100%
rename from include_bsd/atf-c/tc.h
rename to include/freebsd/atf-c/tc.h
diff --git a/include_bsd/atf-c/tp.h b/include/freebsd/atf-c/tp.h
similarity index 100%
rename from include_bsd/atf-c/tp.h
rename to include/freebsd/atf-c/tp.h
diff --git a/include_bsd/atf-c/utils.h b/include/freebsd/atf-c/utils.h
similarity index 100%
rename from include_bsd/atf-c/utils.h
rename to include/freebsd/atf-c/utils.h
diff --git a/include_bsd/base64.h b/include/freebsd/base64.h
similarity index 100%
rename from include_bsd/base64.h
rename to include/freebsd/base64.h
diff --git a/include_bsd/bitstring.h b/include/freebsd/bitstring.h
similarity index 100%
rename from include_bsd/bitstring.h
rename to include/freebsd/bitstring.h
diff --git a/include_bsd/blacklist.h b/include/freebsd/blacklist.h
similarity index 100%
rename from include_bsd/blacklist.h
rename to include/freebsd/blacklist.h
diff --git a/include_bsd/bluetooth.h b/include/freebsd/bluetooth.h
similarity index 100%
rename from include_bsd/bluetooth.h
rename to include/freebsd/bluetooth.h
diff --git a/include_bsd/bsdxml.h b/include/freebsd/bsdxml.h
similarity index 100%
rename from include_bsd/bsdxml.h
rename to include/freebsd/bsdxml.h
diff --git a/include_bsd/bsdxml_external.h b/include/freebsd/bsdxml_external.h
similarity index 100%
rename from include_bsd/bsdxml_external.h
rename to include/freebsd/bsdxml_external.h
diff --git a/include_bsd/bsm/audit.h b/include/freebsd/bsm/audit.h
similarity index 100%
rename from include_bsd/bsm/audit.h
rename to include/freebsd/bsm/audit.h
diff --git a/include_bsd/bsm/audit_domain.h b/include/freebsd/bsm/audit_domain.h
similarity index 100%
rename from include_bsd/bsm/audit_domain.h
rename to include/freebsd/bsm/audit_domain.h
diff --git a/include_bsd/bsm/audit_errno.h b/include/freebsd/bsm/audit_errno.h
similarity index 100%
rename from include_bsd/bsm/audit_errno.h
rename to include/freebsd/bsm/audit_errno.h
diff --git a/include_bsd/bsm/audit_fcntl.h b/include/freebsd/bsm/audit_fcntl.h
similarity index 100%
rename from include_bsd/bsm/audit_fcntl.h
rename to include/freebsd/bsm/audit_fcntl.h
diff --git a/include_bsd/bsm/audit_internal.h b/include/freebsd/bsm/audit_internal.h
similarity index 100%
rename from include_bsd/bsm/audit_internal.h
rename to include/freebsd/bsm/audit_internal.h
diff --git a/include_bsd/bsm/audit_kevents.h b/include/freebsd/bsm/audit_kevents.h
similarity index 100%
rename from include_bsd/bsm/audit_kevents.h
rename to include/freebsd/bsm/audit_kevents.h
diff --git a/include_bsd/bsm/audit_record.h b/include/freebsd/bsm/audit_record.h
similarity index 100%
rename from include_bsd/bsm/audit_record.h
rename to include/freebsd/bsm/audit_record.h
diff --git a/include_bsd/bsm/audit_socket_type.h b/include/freebsd/bsm/audit_socket_type.h
similarity index 100%
rename from include_bsd/bsm/audit_socket_type.h
rename to include/freebsd/bsm/audit_socket_type.h
diff --git a/include_bsd/bsm/audit_uevents.h b/include/freebsd/bsm/audit_uevents.h
similarity index 100%
rename from include_bsd/bsm/audit_uevents.h
rename to include/freebsd/bsm/audit_uevents.h
diff --git a/include_bsd/bsm/libbsm.h b/include/freebsd/bsm/libbsm.h
similarity index 100%
rename from include_bsd/bsm/libbsm.h
rename to include/freebsd/bsm/libbsm.h
diff --git a/include_bsd/bsnmp/asn1.h b/include/freebsd/bsnmp/asn1.h
similarity index 100%
rename from include_bsd/bsnmp/asn1.h
rename to include/freebsd/bsnmp/asn1.h
diff --git a/include_bsd/bsnmp/bridge_snmp.h b/include/freebsd/bsnmp/bridge_snmp.h
similarity index 100%
rename from include_bsd/bsnmp/bridge_snmp.h
rename to include/freebsd/bsnmp/bridge_snmp.h
diff --git a/include_bsd/bsnmp/snmp.h b/include/freebsd/bsnmp/snmp.h
similarity index 100%
rename from include_bsd/bsnmp/snmp.h
rename to include/freebsd/bsnmp/snmp.h
diff --git a/include_bsd/bsnmp/snmp_atm.h b/include/freebsd/bsnmp/snmp_atm.h
similarity index 100%
rename from include_bsd/bsnmp/snmp_atm.h
rename to include/freebsd/bsnmp/snmp_atm.h
diff --git a/include_bsd/bsnmp/snmp_mibII.h b/include/freebsd/bsnmp/snmp_mibII.h
similarity index 100%
rename from include_bsd/bsnmp/snmp_mibII.h
rename to include/freebsd/bsnmp/snmp_mibII.h
diff --git a/include_bsd/bsnmp/snmp_netgraph.h b/include/freebsd/bsnmp/snmp_netgraph.h
similarity index 100%
rename from include_bsd/bsnmp/snmp_netgraph.h
rename to include/freebsd/bsnmp/snmp_netgraph.h
diff --git a/include_bsd/bsnmp/snmpagent.h b/include/freebsd/bsnmp/snmpagent.h
similarity index 100%
rename from include_bsd/bsnmp/snmpagent.h
rename to include/freebsd/bsnmp/snmpagent.h
diff --git a/include_bsd/bsnmp/snmpclient.h b/include/freebsd/bsnmp/snmpclient.h
similarity index 100%
rename from include_bsd/bsnmp/snmpclient.h
rename to include/freebsd/bsnmp/snmpclient.h
diff --git a/include_bsd/bsnmp/snmpmod.h b/include/freebsd/bsnmp/snmpmod.h
similarity index 100%
rename from include_bsd/bsnmp/snmpmod.h
rename to include/freebsd/bsnmp/snmpmod.h
diff --git a/include_bsd/c++/v1/__bit_reference b/include/freebsd/c++/v1/__bit_reference
similarity index 100%
rename from include_bsd/c++/v1/__bit_reference
rename to include/freebsd/c++/v1/__bit_reference
diff --git a/include_bsd/c++/v1/__config b/include/freebsd/c++/v1/__config
similarity index 100%
rename from include_bsd/c++/v1/__config
rename to include/freebsd/c++/v1/__config
diff --git a/include_bsd/c++/v1/__debug b/include/freebsd/c++/v1/__debug
similarity index 100%
rename from include_bsd/c++/v1/__debug
rename to include/freebsd/c++/v1/__debug
diff --git a/include_bsd/c++/v1/__functional_03 b/include/freebsd/c++/v1/__functional_03
similarity index 100%
rename from include_bsd/c++/v1/__functional_03
rename to include/freebsd/c++/v1/__functional_03
diff --git a/include_bsd/c++/v1/__functional_base b/include/freebsd/c++/v1/__functional_base
similarity index 100%
rename from include_bsd/c++/v1/__functional_base
rename to include/freebsd/c++/v1/__functional_base
diff --git a/include_bsd/c++/v1/__functional_base_03 b/include/freebsd/c++/v1/__functional_base_03
similarity index 100%
rename from include_bsd/c++/v1/__functional_base_03
rename to include/freebsd/c++/v1/__functional_base_03
diff --git a/include_bsd/c++/v1/__hash_table b/include/freebsd/c++/v1/__hash_table
similarity index 100%
rename from include_bsd/c++/v1/__hash_table
rename to include/freebsd/c++/v1/__hash_table
diff --git a/include_bsd/c++/v1/__locale b/include/freebsd/c++/v1/__locale
similarity index 100%
rename from include_bsd/c++/v1/__locale
rename to include/freebsd/c++/v1/__locale
diff --git a/include_bsd/c++/v1/__mutex_base b/include/freebsd/c++/v1/__mutex_base
similarity index 100%
rename from include_bsd/c++/v1/__mutex_base
rename to include/freebsd/c++/v1/__mutex_base
diff --git a/include_bsd/c++/v1/__nullptr b/include/freebsd/c++/v1/__nullptr
similarity index 100%
rename from include_bsd/c++/v1/__nullptr
rename to include/freebsd/c++/v1/__nullptr
diff --git a/include_bsd/c++/v1/__refstring b/include/freebsd/c++/v1/__refstring
similarity index 100%
rename from include_bsd/c++/v1/__refstring
rename to include/freebsd/c++/v1/__refstring
diff --git a/include_bsd/c++/v1/__split_buffer b/include/freebsd/c++/v1/__split_buffer
similarity index 100%
rename from include_bsd/c++/v1/__split_buffer
rename to include/freebsd/c++/v1/__split_buffer
diff --git a/include_bsd/c++/v1/__sso_allocator b/include/freebsd/c++/v1/__sso_allocator
similarity index 100%
rename from include_bsd/c++/v1/__sso_allocator
rename to include/freebsd/c++/v1/__sso_allocator
diff --git a/include_bsd/c++/v1/__std_stream b/include/freebsd/c++/v1/__std_stream
similarity index 100%
rename from include_bsd/c++/v1/__std_stream
rename to include/freebsd/c++/v1/__std_stream
diff --git a/include_bsd/c++/v1/__tree b/include/freebsd/c++/v1/__tree
similarity index 100%
rename from include_bsd/c++/v1/__tree
rename to include/freebsd/c++/v1/__tree
diff --git a/include_bsd/c++/v1/__tuple b/include/freebsd/c++/v1/__tuple
similarity index 100%
rename from include_bsd/c++/v1/__tuple
rename to include/freebsd/c++/v1/__tuple
diff --git a/include_bsd/c++/v1/__undef___deallocate b/include/freebsd/c++/v1/__undef___deallocate
similarity index 100%
rename from include_bsd/c++/v1/__undef___deallocate
rename to include/freebsd/c++/v1/__undef___deallocate
diff --git a/include_bsd/c++/v1/__undef_min_max b/include/freebsd/c++/v1/__undef_min_max
similarity index 100%
rename from include_bsd/c++/v1/__undef_min_max
rename to include/freebsd/c++/v1/__undef_min_max
diff --git a/include_bsd/c++/v1/algorithm b/include/freebsd/c++/v1/algorithm
similarity index 100%
rename from include_bsd/c++/v1/algorithm
rename to include/freebsd/c++/v1/algorithm
diff --git a/include_bsd/c++/v1/array b/include/freebsd/c++/v1/array
similarity index 100%
rename from include_bsd/c++/v1/array
rename to include/freebsd/c++/v1/array
diff --git a/include_bsd/c++/v1/atomic b/include/freebsd/c++/v1/atomic
similarity index 100%
rename from include_bsd/c++/v1/atomic
rename to include/freebsd/c++/v1/atomic
diff --git a/include_bsd/c++/v1/bitset b/include/freebsd/c++/v1/bitset
similarity index 100%
rename from include_bsd/c++/v1/bitset
rename to include/freebsd/c++/v1/bitset
diff --git a/include_bsd/c++/v1/cassert b/include/freebsd/c++/v1/cassert
similarity index 100%
rename from include_bsd/c++/v1/cassert
rename to include/freebsd/c++/v1/cassert
diff --git a/include_bsd/c++/v1/ccomplex b/include/freebsd/c++/v1/ccomplex
similarity index 100%
rename from include_bsd/c++/v1/ccomplex
rename to include/freebsd/c++/v1/ccomplex
diff --git a/include_bsd/c++/v1/cctype b/include/freebsd/c++/v1/cctype
similarity index 100%
rename from include_bsd/c++/v1/cctype
rename to include/freebsd/c++/v1/cctype
diff --git a/include_bsd/c++/v1/cerrno b/include/freebsd/c++/v1/cerrno
similarity index 100%
rename from include_bsd/c++/v1/cerrno
rename to include/freebsd/c++/v1/cerrno
diff --git a/include_bsd/c++/v1/cfenv b/include/freebsd/c++/v1/cfenv
similarity index 100%
rename from include_bsd/c++/v1/cfenv
rename to include/freebsd/c++/v1/cfenv
diff --git a/include_bsd/c++/v1/cfloat b/include/freebsd/c++/v1/cfloat
similarity index 100%
rename from include_bsd/c++/v1/cfloat
rename to include/freebsd/c++/v1/cfloat
diff --git a/include_bsd/c++/v1/chrono b/include/freebsd/c++/v1/chrono
similarity index 100%
rename from include_bsd/c++/v1/chrono
rename to include/freebsd/c++/v1/chrono
diff --git a/include_bsd/c++/v1/cinttypes b/include/freebsd/c++/v1/cinttypes
similarity index 100%
rename from include_bsd/c++/v1/cinttypes
rename to include/freebsd/c++/v1/cinttypes
diff --git a/include_bsd/c++/v1/ciso646 b/include/freebsd/c++/v1/ciso646
similarity index 100%
rename from include_bsd/c++/v1/ciso646
rename to include/freebsd/c++/v1/ciso646
diff --git a/include_bsd/c++/v1/climits b/include/freebsd/c++/v1/climits
similarity index 100%
rename from include_bsd/c++/v1/climits
rename to include/freebsd/c++/v1/climits
diff --git a/include_bsd/c++/v1/clocale b/include/freebsd/c++/v1/clocale
similarity index 100%
rename from include_bsd/c++/v1/clocale
rename to include/freebsd/c++/v1/clocale
diff --git a/include_bsd/c++/v1/cmath b/include/freebsd/c++/v1/cmath
similarity index 100%
rename from include_bsd/c++/v1/cmath
rename to include/freebsd/c++/v1/cmath
diff --git a/include_bsd/c++/v1/codecvt b/include/freebsd/c++/v1/codecvt
similarity index 100%
rename from include_bsd/c++/v1/codecvt
rename to include/freebsd/c++/v1/codecvt
diff --git a/include_bsd/c++/v1/complex b/include/freebsd/c++/v1/complex
similarity index 100%
rename from include_bsd/c++/v1/complex
rename to include/freebsd/c++/v1/complex
diff --git a/include_bsd/c++/v1/complex.h b/include/freebsd/c++/v1/complex.h
similarity index 100%
rename from include_bsd/c++/v1/complex.h
rename to include/freebsd/c++/v1/complex.h
diff --git a/include_bsd/c++/v1/condition_variable b/include/freebsd/c++/v1/condition_variable
similarity index 100%
rename from include_bsd/c++/v1/condition_variable
rename to include/freebsd/c++/v1/condition_variable
diff --git a/include_bsd/c++/v1/csetjmp b/include/freebsd/c++/v1/csetjmp
similarity index 100%
rename from include_bsd/c++/v1/csetjmp
rename to include/freebsd/c++/v1/csetjmp
diff --git a/include_bsd/c++/v1/csignal b/include/freebsd/c++/v1/csignal
similarity index 100%
rename from include_bsd/c++/v1/csignal
rename to include/freebsd/c++/v1/csignal
diff --git a/include_bsd/c++/v1/cstdarg b/include/freebsd/c++/v1/cstdarg
similarity index 100%
rename from include_bsd/c++/v1/cstdarg
rename to include/freebsd/c++/v1/cstdarg
diff --git a/include_bsd/c++/v1/cstdbool b/include/freebsd/c++/v1/cstdbool
similarity index 100%
rename from include_bsd/c++/v1/cstdbool
rename to include/freebsd/c++/v1/cstdbool
diff --git a/include_bsd/c++/v1/cstddef b/include/freebsd/c++/v1/cstddef
similarity index 100%
rename from include_bsd/c++/v1/cstddef
rename to include/freebsd/c++/v1/cstddef
diff --git a/include_bsd/c++/v1/cstdint b/include/freebsd/c++/v1/cstdint
similarity index 100%
rename from include_bsd/c++/v1/cstdint
rename to include/freebsd/c++/v1/cstdint
diff --git a/include_bsd/c++/v1/cstdio b/include/freebsd/c++/v1/cstdio
similarity index 100%
rename from include_bsd/c++/v1/cstdio
rename to include/freebsd/c++/v1/cstdio
diff --git a/include_bsd/c++/v1/cstdlib b/include/freebsd/c++/v1/cstdlib
similarity index 100%
rename from include_bsd/c++/v1/cstdlib
rename to include/freebsd/c++/v1/cstdlib
diff --git a/include_bsd/c++/v1/cstring b/include/freebsd/c++/v1/cstring
similarity index 100%
rename from include_bsd/c++/v1/cstring
rename to include/freebsd/c++/v1/cstring
diff --git a/include_bsd/c++/v1/ctgmath b/include/freebsd/c++/v1/ctgmath
similarity index 100%
rename from include_bsd/c++/v1/ctgmath
rename to include/freebsd/c++/v1/ctgmath
diff --git a/include_bsd/c++/v1/ctime b/include/freebsd/c++/v1/ctime
similarity index 100%
rename from include_bsd/c++/v1/ctime
rename to include/freebsd/c++/v1/ctime
diff --git a/include_bsd/c++/v1/ctype.h b/include/freebsd/c++/v1/ctype.h
similarity index 100%
rename from include_bsd/c++/v1/ctype.h
rename to include/freebsd/c++/v1/ctype.h
diff --git a/include_bsd/c++/v1/cwchar b/include/freebsd/c++/v1/cwchar
similarity index 100%
rename from include_bsd/c++/v1/cwchar
rename to include/freebsd/c++/v1/cwchar
diff --git a/include_bsd/c++/v1/cwctype b/include/freebsd/c++/v1/cwctype
similarity index 100%
rename from include_bsd/c++/v1/cwctype
rename to include/freebsd/c++/v1/cwctype
diff --git a/include_bsd/c++/v1/cxxabi.h b/include/freebsd/c++/v1/cxxabi.h
similarity index 100%
rename from include_bsd/c++/v1/cxxabi.h
rename to include/freebsd/c++/v1/cxxabi.h
diff --git a/include_bsd/c++/v1/deque b/include/freebsd/c++/v1/deque
similarity index 100%
rename from include_bsd/c++/v1/deque
rename to include/freebsd/c++/v1/deque
diff --git a/include_bsd/c++/v1/errno.h b/include/freebsd/c++/v1/errno.h
similarity index 100%
rename from include_bsd/c++/v1/errno.h
rename to include/freebsd/c++/v1/errno.h
diff --git a/include_bsd/c++/v1/exception b/include/freebsd/c++/v1/exception
similarity index 100%
rename from include_bsd/c++/v1/exception
rename to include/freebsd/c++/v1/exception
diff --git a/include_bsd/c++/v1/experimental/__config b/include/freebsd/c++/v1/experimental/__config
similarity index 100%
rename from include_bsd/c++/v1/experimental/__config
rename to include/freebsd/c++/v1/experimental/__config
diff --git a/include_bsd/c++/v1/experimental/algorithm b/include/freebsd/c++/v1/experimental/algorithm
similarity index 100%
rename from include_bsd/c++/v1/experimental/algorithm
rename to include/freebsd/c++/v1/experimental/algorithm
diff --git a/include_bsd/c++/v1/experimental/any b/include/freebsd/c++/v1/experimental/any
similarity index 100%
rename from include_bsd/c++/v1/experimental/any
rename to include/freebsd/c++/v1/experimental/any
diff --git a/include_bsd/c++/v1/experimental/chrono b/include/freebsd/c++/v1/experimental/chrono
similarity index 100%
rename from include_bsd/c++/v1/experimental/chrono
rename to include/freebsd/c++/v1/experimental/chrono
diff --git a/include_bsd/c++/v1/experimental/dynarray b/include/freebsd/c++/v1/experimental/dynarray
similarity index 100%
rename from include_bsd/c++/v1/experimental/dynarray
rename to include/freebsd/c++/v1/experimental/dynarray
diff --git a/include_bsd/c++/v1/experimental/functional b/include/freebsd/c++/v1/experimental/functional
similarity index 100%
rename from include_bsd/c++/v1/experimental/functional
rename to include/freebsd/c++/v1/experimental/functional
diff --git a/include_bsd/c++/v1/experimental/optional b/include/freebsd/c++/v1/experimental/optional
similarity index 100%
rename from include_bsd/c++/v1/experimental/optional
rename to include/freebsd/c++/v1/experimental/optional
diff --git a/include_bsd/c++/v1/experimental/ratio b/include/freebsd/c++/v1/experimental/ratio
similarity index 100%
rename from include_bsd/c++/v1/experimental/ratio
rename to include/freebsd/c++/v1/experimental/ratio
diff --git a/include_bsd/c++/v1/experimental/string_view b/include/freebsd/c++/v1/experimental/string_view
similarity index 100%
rename from include_bsd/c++/v1/experimental/string_view
rename to include/freebsd/c++/v1/experimental/string_view
diff --git a/include_bsd/c++/v1/experimental/system_error b/include/freebsd/c++/v1/experimental/system_error
similarity index 100%
rename from include_bsd/c++/v1/experimental/system_error
rename to include/freebsd/c++/v1/experimental/system_error
diff --git a/include_bsd/c++/v1/experimental/tuple b/include/freebsd/c++/v1/experimental/tuple
similarity index 100%
rename from include_bsd/c++/v1/experimental/tuple
rename to include/freebsd/c++/v1/experimental/tuple
diff --git a/include_bsd/c++/v1/experimental/type_traits b/include/freebsd/c++/v1/experimental/type_traits
similarity index 100%
rename from include_bsd/c++/v1/experimental/type_traits
rename to include/freebsd/c++/v1/experimental/type_traits
diff --git a/include_bsd/c++/v1/experimental/utility b/include/freebsd/c++/v1/experimental/utility
similarity index 100%
rename from include_bsd/c++/v1/experimental/utility
rename to include/freebsd/c++/v1/experimental/utility
diff --git a/include_bsd/c++/v1/ext/__hash b/include/freebsd/c++/v1/ext/__hash
similarity index 100%
rename from include_bsd/c++/v1/ext/__hash
rename to include/freebsd/c++/v1/ext/__hash
diff --git a/include_bsd/c++/v1/ext/hash_map b/include/freebsd/c++/v1/ext/hash_map
similarity index 100%
rename from include_bsd/c++/v1/ext/hash_map
rename to include/freebsd/c++/v1/ext/hash_map
diff --git a/include_bsd/c++/v1/ext/hash_set b/include/freebsd/c++/v1/ext/hash_set
similarity index 100%
rename from include_bsd/c++/v1/ext/hash_set
rename to include/freebsd/c++/v1/ext/hash_set
diff --git a/include_bsd/c++/v1/float.h b/include/freebsd/c++/v1/float.h
similarity index 100%
rename from include_bsd/c++/v1/float.h
rename to include/freebsd/c++/v1/float.h
diff --git a/include_bsd/c++/v1/forward_list b/include/freebsd/c++/v1/forward_list
similarity index 100%
rename from include_bsd/c++/v1/forward_list
rename to include/freebsd/c++/v1/forward_list
diff --git a/include_bsd/c++/v1/fstream b/include/freebsd/c++/v1/fstream
similarity index 100%
rename from include_bsd/c++/v1/fstream
rename to include/freebsd/c++/v1/fstream
diff --git a/include_bsd/c++/v1/functional b/include/freebsd/c++/v1/functional
similarity index 100%
rename from include_bsd/c++/v1/functional
rename to include/freebsd/c++/v1/functional
diff --git a/include_bsd/c++/v1/future b/include/freebsd/c++/v1/future
similarity index 100%
rename from include_bsd/c++/v1/future
rename to include/freebsd/c++/v1/future
diff --git a/include_bsd/c++/v1/initializer_list b/include/freebsd/c++/v1/initializer_list
similarity index 100%
rename from include_bsd/c++/v1/initializer_list
rename to include/freebsd/c++/v1/initializer_list
diff --git a/include_bsd/c++/v1/inttypes.h b/include/freebsd/c++/v1/inttypes.h
similarity index 100%
rename from include_bsd/c++/v1/inttypes.h
rename to include/freebsd/c++/v1/inttypes.h
diff --git a/include_bsd/c++/v1/iomanip b/include/freebsd/c++/v1/iomanip
similarity index 100%
rename from include_bsd/c++/v1/iomanip
rename to include/freebsd/c++/v1/iomanip
diff --git a/include_bsd/c++/v1/ios b/include/freebsd/c++/v1/ios
similarity index 100%
rename from include_bsd/c++/v1/ios
rename to include/freebsd/c++/v1/ios
diff --git a/include_bsd/c++/v1/iosfwd b/include/freebsd/c++/v1/iosfwd
similarity index 100%
rename from include_bsd/c++/v1/iosfwd
rename to include/freebsd/c++/v1/iosfwd
diff --git a/include_bsd/c++/v1/iostream b/include/freebsd/c++/v1/iostream
similarity index 100%
rename from include_bsd/c++/v1/iostream
rename to include/freebsd/c++/v1/iostream
diff --git a/include_bsd/c++/v1/istream b/include/freebsd/c++/v1/istream
similarity index 100%
rename from include_bsd/c++/v1/istream
rename to include/freebsd/c++/v1/istream
diff --git a/include_bsd/c++/v1/iterator b/include/freebsd/c++/v1/iterator
similarity index 100%
rename from include_bsd/c++/v1/iterator
rename to include/freebsd/c++/v1/iterator
diff --git a/include_bsd/c++/v1/limits b/include/freebsd/c++/v1/limits
similarity index 100%
rename from include_bsd/c++/v1/limits
rename to include/freebsd/c++/v1/limits
diff --git a/include_bsd/c++/v1/list b/include/freebsd/c++/v1/list
similarity index 100%
rename from include_bsd/c++/v1/list
rename to include/freebsd/c++/v1/list
diff --git a/include_bsd/c++/v1/locale b/include/freebsd/c++/v1/locale
similarity index 100%
rename from include_bsd/c++/v1/locale
rename to include/freebsd/c++/v1/locale
diff --git a/include_bsd/c++/v1/map b/include/freebsd/c++/v1/map
similarity index 100%
rename from include_bsd/c++/v1/map
rename to include/freebsd/c++/v1/map
diff --git a/include_bsd/c++/v1/math.h b/include/freebsd/c++/v1/math.h
similarity index 100%
rename from include_bsd/c++/v1/math.h
rename to include/freebsd/c++/v1/math.h
diff --git a/include_bsd/c++/v1/memory b/include/freebsd/c++/v1/memory
similarity index 100%
rename from include_bsd/c++/v1/memory
rename to include/freebsd/c++/v1/memory
diff --git a/include_bsd/c++/v1/mutex b/include/freebsd/c++/v1/mutex
similarity index 100%
rename from include_bsd/c++/v1/mutex
rename to include/freebsd/c++/v1/mutex
diff --git a/include_bsd/c++/v1/new b/include/freebsd/c++/v1/new
similarity index 100%
rename from include_bsd/c++/v1/new
rename to include/freebsd/c++/v1/new
diff --git a/include_bsd/c++/v1/numeric b/include/freebsd/c++/v1/numeric
similarity index 100%
rename from include_bsd/c++/v1/numeric
rename to include/freebsd/c++/v1/numeric
diff --git a/include_bsd/c++/v1/ostream b/include/freebsd/c++/v1/ostream
similarity index 100%
rename from include_bsd/c++/v1/ostream
rename to include/freebsd/c++/v1/ostream
diff --git a/include_bsd/c++/v1/queue b/include/freebsd/c++/v1/queue
similarity index 100%
rename from include_bsd/c++/v1/queue
rename to include/freebsd/c++/v1/queue
diff --git a/include_bsd/c++/v1/random b/include/freebsd/c++/v1/random
similarity index 100%
rename from include_bsd/c++/v1/random
rename to include/freebsd/c++/v1/random
diff --git a/include_bsd/c++/v1/ratio b/include/freebsd/c++/v1/ratio
similarity index 100%
rename from include_bsd/c++/v1/ratio
rename to include/freebsd/c++/v1/ratio
diff --git a/include_bsd/c++/v1/regex b/include/freebsd/c++/v1/regex
similarity index 100%
rename from include_bsd/c++/v1/regex
rename to include/freebsd/c++/v1/regex
diff --git a/include_bsd/c++/v1/scoped_allocator b/include/freebsd/c++/v1/scoped_allocator
similarity index 100%
rename from include_bsd/c++/v1/scoped_allocator
rename to include/freebsd/c++/v1/scoped_allocator
diff --git a/include_bsd/c++/v1/set b/include/freebsd/c++/v1/set
similarity index 100%
rename from include_bsd/c++/v1/set
rename to include/freebsd/c++/v1/set
diff --git a/include_bsd/c++/v1/setjmp.h b/include/freebsd/c++/v1/setjmp.h
similarity index 100%
rename from include_bsd/c++/v1/setjmp.h
rename to include/freebsd/c++/v1/setjmp.h
diff --git a/include_bsd/c++/v1/shared_mutex b/include/freebsd/c++/v1/shared_mutex
similarity index 100%
rename from include_bsd/c++/v1/shared_mutex
rename to include/freebsd/c++/v1/shared_mutex
diff --git a/include_bsd/c++/v1/sstream b/include/freebsd/c++/v1/sstream
similarity index 100%
rename from include_bsd/c++/v1/sstream
rename to include/freebsd/c++/v1/sstream
diff --git a/include_bsd/c++/v1/stack b/include/freebsd/c++/v1/stack
similarity index 100%
rename from include_bsd/c++/v1/stack
rename to include/freebsd/c++/v1/stack
diff --git a/include_bsd/c++/v1/stddef.h b/include/freebsd/c++/v1/stddef.h
similarity index 100%
rename from include_bsd/c++/v1/stddef.h
rename to include/freebsd/c++/v1/stddef.h
diff --git a/include_bsd/c++/v1/stdexcept b/include/freebsd/c++/v1/stdexcept
similarity index 100%
rename from include_bsd/c++/v1/stdexcept
rename to include/freebsd/c++/v1/stdexcept
diff --git a/include_bsd/c++/v1/stdio.h b/include/freebsd/c++/v1/stdio.h
similarity index 100%
rename from include_bsd/c++/v1/stdio.h
rename to include/freebsd/c++/v1/stdio.h
diff --git a/include_bsd/c++/v1/stdlib.h b/include/freebsd/c++/v1/stdlib.h
similarity index 100%
rename from include_bsd/c++/v1/stdlib.h
rename to include/freebsd/c++/v1/stdlib.h
diff --git a/include_bsd/c++/v1/streambuf b/include/freebsd/c++/v1/streambuf
similarity index 100%
rename from include_bsd/c++/v1/streambuf
rename to include/freebsd/c++/v1/streambuf
diff --git a/include_bsd/c++/v1/string b/include/freebsd/c++/v1/string
similarity index 100%
rename from include_bsd/c++/v1/string
rename to include/freebsd/c++/v1/string
diff --git a/include_bsd/c++/v1/strstream b/include/freebsd/c++/v1/strstream
similarity index 100%
rename from include_bsd/c++/v1/strstream
rename to include/freebsd/c++/v1/strstream
diff --git a/include_bsd/c++/v1/system_error b/include/freebsd/c++/v1/system_error
similarity index 100%
rename from include_bsd/c++/v1/system_error
rename to include/freebsd/c++/v1/system_error
diff --git a/include_bsd/c++/v1/tgmath.h b/include/freebsd/c++/v1/tgmath.h
similarity index 100%
rename from include_bsd/c++/v1/tgmath.h
rename to include/freebsd/c++/v1/tgmath.h
diff --git a/include_bsd/c++/v1/thread b/include/freebsd/c++/v1/thread
similarity index 100%
rename from include_bsd/c++/v1/thread
rename to include/freebsd/c++/v1/thread
diff --git a/include_bsd/c++/v1/tr1/__bit_reference b/include/freebsd/c++/v1/tr1/__bit_reference
similarity index 100%
rename from include_bsd/c++/v1/tr1/__bit_reference
rename to include/freebsd/c++/v1/tr1/__bit_reference
diff --git a/include_bsd/c++/v1/tr1/__config b/include/freebsd/c++/v1/tr1/__config
similarity index 100%
rename from include_bsd/c++/v1/tr1/__config
rename to include/freebsd/c++/v1/tr1/__config
diff --git a/include_bsd/c++/v1/tr1/__debug b/include/freebsd/c++/v1/tr1/__debug
similarity index 100%
rename from include_bsd/c++/v1/tr1/__debug
rename to include/freebsd/c++/v1/tr1/__debug
diff --git a/include_bsd/c++/v1/tr1/__functional_03 b/include/freebsd/c++/v1/tr1/__functional_03
similarity index 100%
rename from include_bsd/c++/v1/tr1/__functional_03
rename to include/freebsd/c++/v1/tr1/__functional_03
diff --git a/include_bsd/c++/v1/tr1/__functional_base b/include/freebsd/c++/v1/tr1/__functional_base
similarity index 100%
rename from include_bsd/c++/v1/tr1/__functional_base
rename to include/freebsd/c++/v1/tr1/__functional_base
diff --git a/include_bsd/c++/v1/tr1/__functional_base_03 b/include/freebsd/c++/v1/tr1/__functional_base_03
similarity index 100%
rename from include_bsd/c++/v1/tr1/__functional_base_03
rename to include/freebsd/c++/v1/tr1/__functional_base_03
diff --git a/include_bsd/c++/v1/tr1/__hash_table b/include/freebsd/c++/v1/tr1/__hash_table
similarity index 100%
rename from include_bsd/c++/v1/tr1/__hash_table
rename to include/freebsd/c++/v1/tr1/__hash_table
diff --git a/include_bsd/c++/v1/tr1/__locale b/include/freebsd/c++/v1/tr1/__locale
similarity index 100%
rename from include_bsd/c++/v1/tr1/__locale
rename to include/freebsd/c++/v1/tr1/__locale
diff --git a/include_bsd/c++/v1/tr1/__mutex_base b/include/freebsd/c++/v1/tr1/__mutex_base
similarity index 100%
rename from include_bsd/c++/v1/tr1/__mutex_base
rename to include/freebsd/c++/v1/tr1/__mutex_base
diff --git a/include_bsd/c++/v1/tr1/__nullptr b/include/freebsd/c++/v1/tr1/__nullptr
similarity index 100%
rename from include_bsd/c++/v1/tr1/__nullptr
rename to include/freebsd/c++/v1/tr1/__nullptr
diff --git a/include_bsd/c++/v1/tr1/__refstring b/include/freebsd/c++/v1/tr1/__refstring
similarity index 100%
rename from include_bsd/c++/v1/tr1/__refstring
rename to include/freebsd/c++/v1/tr1/__refstring
diff --git a/include_bsd/c++/v1/tr1/__split_buffer b/include/freebsd/c++/v1/tr1/__split_buffer
similarity index 100%
rename from include_bsd/c++/v1/tr1/__split_buffer
rename to include/freebsd/c++/v1/tr1/__split_buffer
diff --git a/include_bsd/c++/v1/tr1/__sso_allocator b/include/freebsd/c++/v1/tr1/__sso_allocator
similarity index 100%
rename from include_bsd/c++/v1/tr1/__sso_allocator
rename to include/freebsd/c++/v1/tr1/__sso_allocator
diff --git a/include_bsd/c++/v1/tr1/__std_stream b/include/freebsd/c++/v1/tr1/__std_stream
similarity index 100%
rename from include_bsd/c++/v1/tr1/__std_stream
rename to include/freebsd/c++/v1/tr1/__std_stream
diff --git a/include_bsd/c++/v1/tr1/__tree b/include/freebsd/c++/v1/tr1/__tree
similarity index 100%
rename from include_bsd/c++/v1/tr1/__tree
rename to include/freebsd/c++/v1/tr1/__tree
diff --git a/include_bsd/c++/v1/tr1/__tuple b/include/freebsd/c++/v1/tr1/__tuple
similarity index 100%
rename from include_bsd/c++/v1/tr1/__tuple
rename to include/freebsd/c++/v1/tr1/__tuple
diff --git a/include_bsd/c++/v1/tr1/__undef___deallocate b/include/freebsd/c++/v1/tr1/__undef___deallocate
similarity index 100%
rename from include_bsd/c++/v1/tr1/__undef___deallocate
rename to include/freebsd/c++/v1/tr1/__undef___deallocate
diff --git a/include_bsd/c++/v1/tr1/__undef_min_max b/include/freebsd/c++/v1/tr1/__undef_min_max
similarity index 100%
rename from include_bsd/c++/v1/tr1/__undef_min_max
rename to include/freebsd/c++/v1/tr1/__undef_min_max
diff --git a/include_bsd/c++/v1/tr1/algorithm b/include/freebsd/c++/v1/tr1/algorithm
similarity index 100%
rename from include_bsd/c++/v1/tr1/algorithm
rename to include/freebsd/c++/v1/tr1/algorithm
diff --git a/include_bsd/c++/v1/tr1/array b/include/freebsd/c++/v1/tr1/array
similarity index 100%
rename from include_bsd/c++/v1/tr1/array
rename to include/freebsd/c++/v1/tr1/array
diff --git a/include_bsd/c++/v1/tr1/atomic b/include/freebsd/c++/v1/tr1/atomic
similarity index 100%
rename from include_bsd/c++/v1/tr1/atomic
rename to include/freebsd/c++/v1/tr1/atomic
diff --git a/include_bsd/c++/v1/tr1/bitset b/include/freebsd/c++/v1/tr1/bitset
similarity index 100%
rename from include_bsd/c++/v1/tr1/bitset
rename to include/freebsd/c++/v1/tr1/bitset
diff --git a/include_bsd/c++/v1/tr1/cassert b/include/freebsd/c++/v1/tr1/cassert
similarity index 100%
rename from include_bsd/c++/v1/tr1/cassert
rename to include/freebsd/c++/v1/tr1/cassert
diff --git a/include_bsd/c++/v1/tr1/ccomplex b/include/freebsd/c++/v1/tr1/ccomplex
similarity index 100%
rename from include_bsd/c++/v1/tr1/ccomplex
rename to include/freebsd/c++/v1/tr1/ccomplex
diff --git a/include_bsd/c++/v1/tr1/cctype b/include/freebsd/c++/v1/tr1/cctype
similarity index 100%
rename from include_bsd/c++/v1/tr1/cctype
rename to include/freebsd/c++/v1/tr1/cctype
diff --git a/include_bsd/c++/v1/tr1/cerrno b/include/freebsd/c++/v1/tr1/cerrno
similarity index 100%
rename from include_bsd/c++/v1/tr1/cerrno
rename to include/freebsd/c++/v1/tr1/cerrno
diff --git a/include_bsd/c++/v1/tr1/cfenv b/include/freebsd/c++/v1/tr1/cfenv
similarity index 100%
rename from include_bsd/c++/v1/tr1/cfenv
rename to include/freebsd/c++/v1/tr1/cfenv
diff --git a/include_bsd/c++/v1/tr1/cfloat b/include/freebsd/c++/v1/tr1/cfloat
similarity index 100%
rename from include_bsd/c++/v1/tr1/cfloat
rename to include/freebsd/c++/v1/tr1/cfloat
diff --git a/include_bsd/c++/v1/tr1/chrono b/include/freebsd/c++/v1/tr1/chrono
similarity index 100%
rename from include_bsd/c++/v1/tr1/chrono
rename to include/freebsd/c++/v1/tr1/chrono
diff --git a/include_bsd/c++/v1/tr1/cinttypes b/include/freebsd/c++/v1/tr1/cinttypes
similarity index 100%
rename from include_bsd/c++/v1/tr1/cinttypes
rename to include/freebsd/c++/v1/tr1/cinttypes
diff --git a/include_bsd/c++/v1/tr1/ciso646 b/include/freebsd/c++/v1/tr1/ciso646
similarity index 100%
rename from include_bsd/c++/v1/tr1/ciso646
rename to include/freebsd/c++/v1/tr1/ciso646
diff --git a/include_bsd/c++/v1/tr1/climits b/include/freebsd/c++/v1/tr1/climits
similarity index 100%
rename from include_bsd/c++/v1/tr1/climits
rename to include/freebsd/c++/v1/tr1/climits
diff --git a/include_bsd/c++/v1/tr1/clocale b/include/freebsd/c++/v1/tr1/clocale
similarity index 100%
rename from include_bsd/c++/v1/tr1/clocale
rename to include/freebsd/c++/v1/tr1/clocale
diff --git a/include_bsd/c++/v1/tr1/cmath b/include/freebsd/c++/v1/tr1/cmath
similarity index 100%
rename from include_bsd/c++/v1/tr1/cmath
rename to include/freebsd/c++/v1/tr1/cmath
diff --git a/include_bsd/c++/v1/tr1/codecvt b/include/freebsd/c++/v1/tr1/codecvt
similarity index 100%
rename from include_bsd/c++/v1/tr1/codecvt
rename to include/freebsd/c++/v1/tr1/codecvt
diff --git a/include_bsd/c++/v1/tr1/complex b/include/freebsd/c++/v1/tr1/complex
similarity index 100%
rename from include_bsd/c++/v1/tr1/complex
rename to include/freebsd/c++/v1/tr1/complex
diff --git a/include_bsd/c++/v1/tr1/complex.h b/include/freebsd/c++/v1/tr1/complex.h
similarity index 100%
rename from include_bsd/c++/v1/tr1/complex.h
rename to include/freebsd/c++/v1/tr1/complex.h
diff --git a/include_bsd/c++/v1/tr1/condition_variable b/include/freebsd/c++/v1/tr1/condition_variable
similarity index 100%
rename from include_bsd/c++/v1/tr1/condition_variable
rename to include/freebsd/c++/v1/tr1/condition_variable
diff --git a/include_bsd/c++/v1/tr1/csetjmp b/include/freebsd/c++/v1/tr1/csetjmp
similarity index 100%
rename from include_bsd/c++/v1/tr1/csetjmp
rename to include/freebsd/c++/v1/tr1/csetjmp
diff --git a/include_bsd/c++/v1/tr1/csignal b/include/freebsd/c++/v1/tr1/csignal
similarity index 100%
rename from include_bsd/c++/v1/tr1/csignal
rename to include/freebsd/c++/v1/tr1/csignal
diff --git a/include_bsd/c++/v1/tr1/cstdarg b/include/freebsd/c++/v1/tr1/cstdarg
similarity index 100%
rename from include_bsd/c++/v1/tr1/cstdarg
rename to include/freebsd/c++/v1/tr1/cstdarg
diff --git a/include_bsd/c++/v1/tr1/cstdbool b/include/freebsd/c++/v1/tr1/cstdbool
similarity index 100%
rename from include_bsd/c++/v1/tr1/cstdbool
rename to include/freebsd/c++/v1/tr1/cstdbool
diff --git a/include_bsd/c++/v1/tr1/cstddef b/include/freebsd/c++/v1/tr1/cstddef
similarity index 100%
rename from include_bsd/c++/v1/tr1/cstddef
rename to include/freebsd/c++/v1/tr1/cstddef
diff --git a/include_bsd/c++/v1/tr1/cstdint b/include/freebsd/c++/v1/tr1/cstdint
similarity index 100%
rename from include_bsd/c++/v1/tr1/cstdint
rename to include/freebsd/c++/v1/tr1/cstdint
diff --git a/include_bsd/c++/v1/tr1/cstdio b/include/freebsd/c++/v1/tr1/cstdio
similarity index 100%
rename from include_bsd/c++/v1/tr1/cstdio
rename to include/freebsd/c++/v1/tr1/cstdio
diff --git a/include_bsd/c++/v1/tr1/cstdlib b/include/freebsd/c++/v1/tr1/cstdlib
similarity index 100%
rename from include_bsd/c++/v1/tr1/cstdlib
rename to include/freebsd/c++/v1/tr1/cstdlib
diff --git a/include_bsd/c++/v1/tr1/cstring b/include/freebsd/c++/v1/tr1/cstring
similarity index 100%
rename from include_bsd/c++/v1/tr1/cstring
rename to include/freebsd/c++/v1/tr1/cstring
diff --git a/include_bsd/c++/v1/tr1/ctgmath b/include/freebsd/c++/v1/tr1/ctgmath
similarity index 100%
rename from include_bsd/c++/v1/tr1/ctgmath
rename to include/freebsd/c++/v1/tr1/ctgmath
diff --git a/include_bsd/c++/v1/tr1/ctime b/include/freebsd/c++/v1/tr1/ctime
similarity index 100%
rename from include_bsd/c++/v1/tr1/ctime
rename to include/freebsd/c++/v1/tr1/ctime
diff --git a/include_bsd/c++/v1/tr1/ctype.h b/include/freebsd/c++/v1/tr1/ctype.h
similarity index 100%
rename from include_bsd/c++/v1/tr1/ctype.h
rename to include/freebsd/c++/v1/tr1/ctype.h
diff --git a/include_bsd/c++/v1/tr1/cwchar b/include/freebsd/c++/v1/tr1/cwchar
similarity index 100%
rename from include_bsd/c++/v1/tr1/cwchar
rename to include/freebsd/c++/v1/tr1/cwchar
diff --git a/include_bsd/c++/v1/tr1/cwctype b/include/freebsd/c++/v1/tr1/cwctype
similarity index 100%
rename from include_bsd/c++/v1/tr1/cwctype
rename to include/freebsd/c++/v1/tr1/cwctype
diff --git a/include_bsd/c++/v1/tr1/deque b/include/freebsd/c++/v1/tr1/deque
similarity index 100%
rename from include_bsd/c++/v1/tr1/deque
rename to include/freebsd/c++/v1/tr1/deque
diff --git a/include_bsd/c++/v1/tr1/errno.h b/include/freebsd/c++/v1/tr1/errno.h
similarity index 100%
rename from include_bsd/c++/v1/tr1/errno.h
rename to include/freebsd/c++/v1/tr1/errno.h
diff --git a/include_bsd/c++/v1/tr1/exception b/include/freebsd/c++/v1/tr1/exception
similarity index 100%
rename from include_bsd/c++/v1/tr1/exception
rename to include/freebsd/c++/v1/tr1/exception
diff --git a/include_bsd/c++/v1/tr1/float.h b/include/freebsd/c++/v1/tr1/float.h
similarity index 100%
rename from include_bsd/c++/v1/tr1/float.h
rename to include/freebsd/c++/v1/tr1/float.h
diff --git a/include_bsd/c++/v1/tr1/forward_list b/include/freebsd/c++/v1/tr1/forward_list
similarity index 100%
rename from include_bsd/c++/v1/tr1/forward_list
rename to include/freebsd/c++/v1/tr1/forward_list
diff --git a/include_bsd/c++/v1/tr1/fstream b/include/freebsd/c++/v1/tr1/fstream
similarity index 100%
rename from include_bsd/c++/v1/tr1/fstream
rename to include/freebsd/c++/v1/tr1/fstream
diff --git a/include_bsd/c++/v1/tr1/functional b/include/freebsd/c++/v1/tr1/functional
similarity index 100%
rename from include_bsd/c++/v1/tr1/functional
rename to include/freebsd/c++/v1/tr1/functional
diff --git a/include_bsd/c++/v1/tr1/future b/include/freebsd/c++/v1/tr1/future
similarity index 100%
rename from include_bsd/c++/v1/tr1/future
rename to include/freebsd/c++/v1/tr1/future
diff --git a/include_bsd/c++/v1/tr1/initializer_list b/include/freebsd/c++/v1/tr1/initializer_list
similarity index 100%
rename from include_bsd/c++/v1/tr1/initializer_list
rename to include/freebsd/c++/v1/tr1/initializer_list
diff --git a/include_bsd/c++/v1/tr1/inttypes.h b/include/freebsd/c++/v1/tr1/inttypes.h
similarity index 100%
rename from include_bsd/c++/v1/tr1/inttypes.h
rename to include/freebsd/c++/v1/tr1/inttypes.h
diff --git a/include_bsd/c++/v1/tr1/iomanip b/include/freebsd/c++/v1/tr1/iomanip
similarity index 100%
rename from include_bsd/c++/v1/tr1/iomanip
rename to include/freebsd/c++/v1/tr1/iomanip
diff --git a/include_bsd/c++/v1/tr1/ios b/include/freebsd/c++/v1/tr1/ios
similarity index 100%
rename from include_bsd/c++/v1/tr1/ios
rename to include/freebsd/c++/v1/tr1/ios
diff --git a/include_bsd/c++/v1/tr1/iosfwd b/include/freebsd/c++/v1/tr1/iosfwd
similarity index 100%
rename from include_bsd/c++/v1/tr1/iosfwd
rename to include/freebsd/c++/v1/tr1/iosfwd
diff --git a/include_bsd/c++/v1/tr1/iostream b/include/freebsd/c++/v1/tr1/iostream
similarity index 100%
rename from include_bsd/c++/v1/tr1/iostream
rename to include/freebsd/c++/v1/tr1/iostream
diff --git a/include_bsd/c++/v1/tr1/istream b/include/freebsd/c++/v1/tr1/istream
similarity index 100%
rename from include_bsd/c++/v1/tr1/istream
rename to include/freebsd/c++/v1/tr1/istream
diff --git a/include_bsd/c++/v1/tr1/iterator b/include/freebsd/c++/v1/tr1/iterator
similarity index 100%
rename from include_bsd/c++/v1/tr1/iterator
rename to include/freebsd/c++/v1/tr1/iterator
diff --git a/include_bsd/c++/v1/tr1/limits b/include/freebsd/c++/v1/tr1/limits
similarity index 100%
rename from include_bsd/c++/v1/tr1/limits
rename to include/freebsd/c++/v1/tr1/limits
diff --git a/include_bsd/c++/v1/tr1/list b/include/freebsd/c++/v1/tr1/list
similarity index 100%
rename from include_bsd/c++/v1/tr1/list
rename to include/freebsd/c++/v1/tr1/list
diff --git a/include_bsd/c++/v1/tr1/locale b/include/freebsd/c++/v1/tr1/locale
similarity index 100%
rename from include_bsd/c++/v1/tr1/locale
rename to include/freebsd/c++/v1/tr1/locale
diff --git a/include_bsd/c++/v1/tr1/map b/include/freebsd/c++/v1/tr1/map
similarity index 100%
rename from include_bsd/c++/v1/tr1/map
rename to include/freebsd/c++/v1/tr1/map
diff --git a/include_bsd/c++/v1/tr1/math.h b/include/freebsd/c++/v1/tr1/math.h
similarity index 100%
rename from include_bsd/c++/v1/tr1/math.h
rename to include/freebsd/c++/v1/tr1/math.h
diff --git a/include_bsd/c++/v1/tr1/memory b/include/freebsd/c++/v1/tr1/memory
similarity index 100%
rename from include_bsd/c++/v1/tr1/memory
rename to include/freebsd/c++/v1/tr1/memory
diff --git a/include_bsd/c++/v1/tr1/mutex b/include/freebsd/c++/v1/tr1/mutex
similarity index 100%
rename from include_bsd/c++/v1/tr1/mutex
rename to include/freebsd/c++/v1/tr1/mutex
diff --git a/include_bsd/c++/v1/tr1/new b/include/freebsd/c++/v1/tr1/new
similarity index 100%
rename from include_bsd/c++/v1/tr1/new
rename to include/freebsd/c++/v1/tr1/new
diff --git a/include_bsd/c++/v1/tr1/numeric b/include/freebsd/c++/v1/tr1/numeric
similarity index 100%
rename from include_bsd/c++/v1/tr1/numeric
rename to include/freebsd/c++/v1/tr1/numeric
diff --git a/include_bsd/c++/v1/tr1/ostream b/include/freebsd/c++/v1/tr1/ostream
similarity index 100%
rename from include_bsd/c++/v1/tr1/ostream
rename to include/freebsd/c++/v1/tr1/ostream
diff --git a/include_bsd/c++/v1/tr1/queue b/include/freebsd/c++/v1/tr1/queue
similarity index 100%
rename from include_bsd/c++/v1/tr1/queue
rename to include/freebsd/c++/v1/tr1/queue
diff --git a/include_bsd/c++/v1/tr1/random b/include/freebsd/c++/v1/tr1/random
similarity index 100%
rename from include_bsd/c++/v1/tr1/random
rename to include/freebsd/c++/v1/tr1/random
diff --git a/include_bsd/c++/v1/tr1/ratio b/include/freebsd/c++/v1/tr1/ratio
similarity index 100%
rename from include_bsd/c++/v1/tr1/ratio
rename to include/freebsd/c++/v1/tr1/ratio
diff --git a/include_bsd/c++/v1/tr1/regex b/include/freebsd/c++/v1/tr1/regex
similarity index 100%
rename from include_bsd/c++/v1/tr1/regex
rename to include/freebsd/c++/v1/tr1/regex
diff --git a/include_bsd/c++/v1/tr1/scoped_allocator b/include/freebsd/c++/v1/tr1/scoped_allocator
similarity index 100%
rename from include_bsd/c++/v1/tr1/scoped_allocator
rename to include/freebsd/c++/v1/tr1/scoped_allocator
diff --git a/include_bsd/c++/v1/tr1/set b/include/freebsd/c++/v1/tr1/set
similarity index 100%
rename from include_bsd/c++/v1/tr1/set
rename to include/freebsd/c++/v1/tr1/set
diff --git a/include_bsd/c++/v1/tr1/setjmp.h b/include/freebsd/c++/v1/tr1/setjmp.h
similarity index 100%
rename from include_bsd/c++/v1/tr1/setjmp.h
rename to include/freebsd/c++/v1/tr1/setjmp.h
diff --git a/include_bsd/c++/v1/tr1/shared_mutex b/include/freebsd/c++/v1/tr1/shared_mutex
similarity index 100%
rename from include_bsd/c++/v1/tr1/shared_mutex
rename to include/freebsd/c++/v1/tr1/shared_mutex
diff --git a/include_bsd/c++/v1/tr1/sstream b/include/freebsd/c++/v1/tr1/sstream
similarity index 100%
rename from include_bsd/c++/v1/tr1/sstream
rename to include/freebsd/c++/v1/tr1/sstream
diff --git a/include_bsd/c++/v1/tr1/stack b/include/freebsd/c++/v1/tr1/stack
similarity index 100%
rename from include_bsd/c++/v1/tr1/stack
rename to include/freebsd/c++/v1/tr1/stack
diff --git a/include_bsd/c++/v1/tr1/stddef.h b/include/freebsd/c++/v1/tr1/stddef.h
similarity index 100%
rename from include_bsd/c++/v1/tr1/stddef.h
rename to include/freebsd/c++/v1/tr1/stddef.h
diff --git a/include_bsd/c++/v1/tr1/stdexcept b/include/freebsd/c++/v1/tr1/stdexcept
similarity index 100%
rename from include_bsd/c++/v1/tr1/stdexcept
rename to include/freebsd/c++/v1/tr1/stdexcept
diff --git a/include_bsd/c++/v1/tr1/stdio.h b/include/freebsd/c++/v1/tr1/stdio.h
similarity index 100%
rename from include_bsd/c++/v1/tr1/stdio.h
rename to include/freebsd/c++/v1/tr1/stdio.h
diff --git a/include_bsd/c++/v1/tr1/stdlib.h b/include/freebsd/c++/v1/tr1/stdlib.h
similarity index 100%
rename from include_bsd/c++/v1/tr1/stdlib.h
rename to include/freebsd/c++/v1/tr1/stdlib.h
diff --git a/include_bsd/c++/v1/tr1/streambuf b/include/freebsd/c++/v1/tr1/streambuf
similarity index 100%
rename from include_bsd/c++/v1/tr1/streambuf
rename to include/freebsd/c++/v1/tr1/streambuf
diff --git a/include_bsd/c++/v1/tr1/string b/include/freebsd/c++/v1/tr1/string
similarity index 100%
rename from include_bsd/c++/v1/tr1/string
rename to include/freebsd/c++/v1/tr1/string
diff --git a/include_bsd/c++/v1/tr1/strstream b/include/freebsd/c++/v1/tr1/strstream
similarity index 100%
rename from include_bsd/c++/v1/tr1/strstream
rename to include/freebsd/c++/v1/tr1/strstream
diff --git a/include_bsd/c++/v1/tr1/system_error b/include/freebsd/c++/v1/tr1/system_error
similarity index 100%
rename from include_bsd/c++/v1/tr1/system_error
rename to include/freebsd/c++/v1/tr1/system_error
diff --git a/include_bsd/c++/v1/tr1/tgmath.h b/include/freebsd/c++/v1/tr1/tgmath.h
similarity index 100%
rename from include_bsd/c++/v1/tr1/tgmath.h
rename to include/freebsd/c++/v1/tr1/tgmath.h
diff --git a/include_bsd/c++/v1/tr1/thread b/include/freebsd/c++/v1/tr1/thread
similarity index 100%
rename from include_bsd/c++/v1/tr1/thread
rename to include/freebsd/c++/v1/tr1/thread
diff --git a/include_bsd/c++/v1/tr1/tuple b/include/freebsd/c++/v1/tr1/tuple
similarity index 100%
rename from include_bsd/c++/v1/tr1/tuple
rename to include/freebsd/c++/v1/tr1/tuple
diff --git a/include_bsd/c++/v1/tr1/type_traits b/include/freebsd/c++/v1/tr1/type_traits
similarity index 100%
rename from include_bsd/c++/v1/tr1/type_traits
rename to include/freebsd/c++/v1/tr1/type_traits
diff --git a/include_bsd/c++/v1/tr1/typeindex b/include/freebsd/c++/v1/tr1/typeindex
similarity index 100%
rename from include_bsd/c++/v1/tr1/typeindex
rename to include/freebsd/c++/v1/tr1/typeindex
diff --git a/include_bsd/c++/v1/tr1/typeinfo b/include/freebsd/c++/v1/tr1/typeinfo
similarity index 100%
rename from include_bsd/c++/v1/tr1/typeinfo
rename to include/freebsd/c++/v1/tr1/typeinfo
diff --git a/include_bsd/c++/v1/tr1/unordered_map b/include/freebsd/c++/v1/tr1/unordered_map
similarity index 100%
rename from include_bsd/c++/v1/tr1/unordered_map
rename to include/freebsd/c++/v1/tr1/unordered_map
diff --git a/include_bsd/c++/v1/tr1/unordered_set b/include/freebsd/c++/v1/tr1/unordered_set
similarity index 100%
rename from include_bsd/c++/v1/tr1/unordered_set
rename to include/freebsd/c++/v1/tr1/unordered_set
diff --git a/include_bsd/c++/v1/tr1/utility b/include/freebsd/c++/v1/tr1/utility
similarity index 100%
rename from include_bsd/c++/v1/tr1/utility
rename to include/freebsd/c++/v1/tr1/utility
diff --git a/include_bsd/c++/v1/tr1/valarray b/include/freebsd/c++/v1/tr1/valarray
similarity index 100%
rename from include_bsd/c++/v1/tr1/valarray
rename to include/freebsd/c++/v1/tr1/valarray
diff --git a/include_bsd/c++/v1/tr1/vector b/include/freebsd/c++/v1/tr1/vector
similarity index 100%
rename from include_bsd/c++/v1/tr1/vector
rename to include/freebsd/c++/v1/tr1/vector
diff --git a/include_bsd/c++/v1/tr1/wchar.h b/include/freebsd/c++/v1/tr1/wchar.h
similarity index 100%
rename from include_bsd/c++/v1/tr1/wchar.h
rename to include/freebsd/c++/v1/tr1/wchar.h
diff --git a/include_bsd/c++/v1/tr1/wctype.h b/include/freebsd/c++/v1/tr1/wctype.h
similarity index 100%
rename from include_bsd/c++/v1/tr1/wctype.h
rename to include/freebsd/c++/v1/tr1/wctype.h
diff --git a/include_bsd/c++/v1/tuple b/include/freebsd/c++/v1/tuple
similarity index 100%
rename from include_bsd/c++/v1/tuple
rename to include/freebsd/c++/v1/tuple
diff --git a/include_bsd/c++/v1/type_traits b/include/freebsd/c++/v1/type_traits
similarity index 100%
rename from include_bsd/c++/v1/type_traits
rename to include/freebsd/c++/v1/type_traits
diff --git a/include_bsd/c++/v1/typeindex b/include/freebsd/c++/v1/typeindex
similarity index 100%
rename from include_bsd/c++/v1/typeindex
rename to include/freebsd/c++/v1/typeindex
diff --git a/include_bsd/c++/v1/typeinfo b/include/freebsd/c++/v1/typeinfo
similarity index 100%
rename from include_bsd/c++/v1/typeinfo
rename to include/freebsd/c++/v1/typeinfo
diff --git a/include_bsd/c++/v1/unordered_map b/include/freebsd/c++/v1/unordered_map
similarity index 100%
rename from include_bsd/c++/v1/unordered_map
rename to include/freebsd/c++/v1/unordered_map
diff --git a/include_bsd/c++/v1/unordered_set b/include/freebsd/c++/v1/unordered_set
similarity index 100%
rename from include_bsd/c++/v1/unordered_set
rename to include/freebsd/c++/v1/unordered_set
diff --git a/include_bsd/c++/v1/unwind-arm.h b/include/freebsd/c++/v1/unwind-arm.h
similarity index 100%
rename from include_bsd/c++/v1/unwind-arm.h
rename to include/freebsd/c++/v1/unwind-arm.h
diff --git a/include_bsd/c++/v1/unwind-itanium.h b/include/freebsd/c++/v1/unwind-itanium.h
similarity index 100%
rename from include_bsd/c++/v1/unwind-itanium.h
rename to include/freebsd/c++/v1/unwind-itanium.h
diff --git a/include_bsd/c++/v1/unwind.h b/include/freebsd/c++/v1/unwind.h
similarity index 100%
rename from include_bsd/c++/v1/unwind.h
rename to include/freebsd/c++/v1/unwind.h
diff --git a/include_bsd/c++/v1/utility b/include/freebsd/c++/v1/utility
similarity index 100%
rename from include_bsd/c++/v1/utility
rename to include/freebsd/c++/v1/utility
diff --git a/include_bsd/c++/v1/valarray b/include/freebsd/c++/v1/valarray
similarity index 100%
rename from include_bsd/c++/v1/valarray
rename to include/freebsd/c++/v1/valarray
diff --git a/include_bsd/c++/v1/vector b/include/freebsd/c++/v1/vector
similarity index 100%
rename from include_bsd/c++/v1/vector
rename to include/freebsd/c++/v1/vector
diff --git a/include_bsd/c++/v1/wchar.h b/include/freebsd/c++/v1/wchar.h
similarity index 100%
rename from include_bsd/c++/v1/wchar.h
rename to include/freebsd/c++/v1/wchar.h
diff --git a/include_bsd/c++/v1/wctype.h b/include/freebsd/c++/v1/wctype.h
similarity index 100%
rename from include_bsd/c++/v1/wctype.h
rename to include/freebsd/c++/v1/wctype.h
diff --git a/include_bsd/calendar.h b/include/freebsd/calendar.h
similarity index 100%
rename from include_bsd/calendar.h
rename to include/freebsd/calendar.h
diff --git a/include_bsd/cam/ata/ata_all.h b/include/freebsd/cam/ata/ata_all.h
similarity index 100%
rename from include_bsd/cam/ata/ata_all.h
rename to include/freebsd/cam/ata/ata_all.h
diff --git a/include_bsd/cam/cam.h b/include/freebsd/cam/cam.h
similarity index 100%
rename from include_bsd/cam/cam.h
rename to include/freebsd/cam/cam.h
diff --git a/include_bsd/cam/cam_ccb.h b/include/freebsd/cam/cam_ccb.h
similarity index 100%
rename from include_bsd/cam/cam_ccb.h
rename to include/freebsd/cam/cam_ccb.h
diff --git a/include_bsd/cam/cam_compat.h b/include/freebsd/cam/cam_compat.h
similarity index 100%
rename from include_bsd/cam/cam_compat.h
rename to include/freebsd/cam/cam_compat.h
diff --git a/include_bsd/cam/cam_debug.h b/include/freebsd/cam/cam_debug.h
similarity index 100%
rename from include_bsd/cam/cam_debug.h
rename to include/freebsd/cam/cam_debug.h
diff --git a/include_bsd/cam/cam_iosched.h b/include/freebsd/cam/cam_iosched.h
similarity index 100%
rename from include_bsd/cam/cam_iosched.h
rename to include/freebsd/cam/cam_iosched.h
diff --git a/include_bsd/cam/cam_periph.h b/include/freebsd/cam/cam_periph.h
similarity index 100%
rename from include_bsd/cam/cam_periph.h
rename to include/freebsd/cam/cam_periph.h
diff --git a/include_bsd/cam/cam_queue.h b/include/freebsd/cam/cam_queue.h
similarity index 100%
rename from include_bsd/cam/cam_queue.h
rename to include/freebsd/cam/cam_queue.h
diff --git a/include_bsd/cam/cam_sim.h b/include/freebsd/cam/cam_sim.h
similarity index 100%
rename from include_bsd/cam/cam_sim.h
rename to include/freebsd/cam/cam_sim.h
diff --git a/include_bsd/cam/cam_xpt.h b/include/freebsd/cam/cam_xpt.h
similarity index 100%
rename from include_bsd/cam/cam_xpt.h
rename to include/freebsd/cam/cam_xpt.h
diff --git a/include_bsd/cam/cam_xpt_internal.h b/include/freebsd/cam/cam_xpt_internal.h
similarity index 100%
rename from include_bsd/cam/cam_xpt_internal.h
rename to include/freebsd/cam/cam_xpt_internal.h
diff --git a/include_bsd/cam/cam_xpt_periph.h b/include/freebsd/cam/cam_xpt_periph.h
similarity index 100%
rename from include_bsd/cam/cam_xpt_periph.h
rename to include/freebsd/cam/cam_xpt_periph.h
diff --git a/include_bsd/cam/cam_xpt_sim.h b/include/freebsd/cam/cam_xpt_sim.h
similarity index 100%
rename from include_bsd/cam/cam_xpt_sim.h
rename to include/freebsd/cam/cam_xpt_sim.h
diff --git a/include_bsd/cam/nvme/nvme_all.h b/include/freebsd/cam/nvme/nvme_all.h
similarity index 100%
rename from include_bsd/cam/nvme/nvme_all.h
rename to include/freebsd/cam/nvme/nvme_all.h
diff --git a/include_bsd/cam/scsi/scsi_all.h b/include/freebsd/cam/scsi/scsi_all.h
similarity index 100%
rename from include_bsd/cam/scsi/scsi_all.h
rename to include/freebsd/cam/scsi/scsi_all.h
diff --git a/include_bsd/cam/scsi/scsi_cd.h b/include/freebsd/cam/scsi/scsi_cd.h
similarity index 100%
rename from include_bsd/cam/scsi/scsi_cd.h
rename to include/freebsd/cam/scsi/scsi_cd.h
diff --git a/include_bsd/cam/scsi/scsi_ch.h b/include/freebsd/cam/scsi/scsi_ch.h
similarity index 100%
rename from include_bsd/cam/scsi/scsi_ch.h
rename to include/freebsd/cam/scsi/scsi_ch.h
diff --git a/include_bsd/cam/scsi/scsi_da.h b/include/freebsd/cam/scsi/scsi_da.h
similarity index 100%
rename from include_bsd/cam/scsi/scsi_da.h
rename to include/freebsd/cam/scsi/scsi_da.h
diff --git a/include_bsd/cam/scsi/scsi_dvcfg.h b/include/freebsd/cam/scsi/scsi_dvcfg.h
similarity index 100%
rename from include_bsd/cam/scsi/scsi_dvcfg.h
rename to include/freebsd/cam/scsi/scsi_dvcfg.h
diff --git a/include_bsd/cam/scsi/scsi_enc.h b/include/freebsd/cam/scsi/scsi_enc.h
similarity index 100%
rename from include_bsd/cam/scsi/scsi_enc.h
rename to include/freebsd/cam/scsi/scsi_enc.h
diff --git a/include_bsd/cam/scsi/scsi_enc_internal.h b/include/freebsd/cam/scsi/scsi_enc_internal.h
similarity index 100%
rename from include_bsd/cam/scsi/scsi_enc_internal.h
rename to include/freebsd/cam/scsi/scsi_enc_internal.h
diff --git a/include_bsd/cam/scsi/scsi_iu.h b/include/freebsd/cam/scsi/scsi_iu.h
similarity index 100%
rename from include_bsd/cam/scsi/scsi_iu.h
rename to include/freebsd/cam/scsi/scsi_iu.h
diff --git a/include_bsd/cam/scsi/scsi_low.h b/include/freebsd/cam/scsi/scsi_low.h
similarity index 100%
rename from include_bsd/cam/scsi/scsi_low.h
rename to include/freebsd/cam/scsi/scsi_low.h
diff --git a/include_bsd/cam/scsi/scsi_message.h b/include/freebsd/cam/scsi/scsi_message.h
similarity index 100%
rename from include_bsd/cam/scsi/scsi_message.h
rename to include/freebsd/cam/scsi/scsi_message.h
diff --git a/include_bsd/cam/scsi/scsi_pass.h b/include/freebsd/cam/scsi/scsi_pass.h
similarity index 100%
rename from include_bsd/cam/scsi/scsi_pass.h
rename to include/freebsd/cam/scsi/scsi_pass.h
diff --git a/include_bsd/cam/scsi/scsi_pt.h b/include/freebsd/cam/scsi/scsi_pt.h
similarity index 100%
rename from include_bsd/cam/scsi/scsi_pt.h
rename to include/freebsd/cam/scsi/scsi_pt.h
diff --git a/include_bsd/cam/scsi/scsi_sa.h b/include/freebsd/cam/scsi/scsi_sa.h
similarity index 100%
rename from include_bsd/cam/scsi/scsi_sa.h
rename to include/freebsd/cam/scsi/scsi_sa.h
diff --git a/include_bsd/cam/scsi/scsi_ses.h b/include/freebsd/cam/scsi/scsi_ses.h
similarity index 100%
rename from include_bsd/cam/scsi/scsi_ses.h
rename to include/freebsd/cam/scsi/scsi_ses.h
diff --git a/include_bsd/cam/scsi/scsi_sg.h b/include/freebsd/cam/scsi/scsi_sg.h
similarity index 100%
rename from include_bsd/cam/scsi/scsi_sg.h
rename to include/freebsd/cam/scsi/scsi_sg.h
diff --git a/include_bsd/cam/scsi/scsi_targetio.h b/include/freebsd/cam/scsi/scsi_targetio.h
similarity index 100%
rename from include_bsd/cam/scsi/scsi_targetio.h
rename to include/freebsd/cam/scsi/scsi_targetio.h
diff --git a/include_bsd/cam/scsi/smp_all.h b/include/freebsd/cam/scsi/smp_all.h
similarity index 100%
rename from include_bsd/cam/scsi/smp_all.h
rename to include/freebsd/cam/scsi/smp_all.h
diff --git a/include_bsd/camlib.h b/include/freebsd/camlib.h
similarity index 100%
rename from include_bsd/camlib.h
rename to include/freebsd/camlib.h
diff --git a/include_bsd/casper/cap_dns.h b/include/freebsd/casper/cap_dns.h
similarity index 100%
rename from include_bsd/casper/cap_dns.h
rename to include/freebsd/casper/cap_dns.h
diff --git a/include_bsd/casper/cap_grp.h b/include/freebsd/casper/cap_grp.h
similarity index 100%
rename from include_bsd/casper/cap_grp.h
rename to include/freebsd/casper/cap_grp.h
diff --git a/include_bsd/casper/cap_pwd.h b/include/freebsd/casper/cap_pwd.h
similarity index 100%
rename from include_bsd/casper/cap_pwd.h
rename to include/freebsd/casper/cap_pwd.h
diff --git a/include_bsd/casper/cap_random.h b/include/freebsd/casper/cap_random.h
similarity index 100%
rename from include_bsd/casper/cap_random.h
rename to include/freebsd/casper/cap_random.h
diff --git a/include_bsd/casper/cap_sysctl.h b/include/freebsd/casper/cap_sysctl.h
similarity index 100%
rename from include_bsd/casper/cap_sysctl.h
rename to include/freebsd/casper/cap_sysctl.h
diff --git a/include_bsd/cms_asn1.h b/include/freebsd/cms_asn1.h
similarity index 100%
rename from include_bsd/cms_asn1.h
rename to include/freebsd/cms_asn1.h
diff --git a/include_bsd/com_err.h b/include/freebsd/com_err.h
similarity index 100%
rename from include_bsd/com_err.h
rename to include/freebsd/com_err.h
diff --git a/include_bsd/com_right.h b/include/freebsd/com_right.h
similarity index 100%
rename from include_bsd/com_right.h
rename to include/freebsd/com_right.h
diff --git a/include_bsd/complex.h b/include/freebsd/complex.h
similarity index 100%
rename from include_bsd/complex.h
rename to include/freebsd/complex.h
diff --git a/include_bsd/cpio.h b/include/freebsd/cpio.h
similarity index 100%
rename from include_bsd/cpio.h
rename to include/freebsd/cpio.h
diff --git a/include_bsd/crmf_asn1.h b/include/freebsd/crmf_asn1.h
similarity index 100%
rename from include_bsd/crmf_asn1.h
rename to include/freebsd/crmf_asn1.h
diff --git a/include_bsd/crypto/cast.h b/include/freebsd/crypto/cast.h
similarity index 100%
rename from include_bsd/crypto/cast.h
rename to include/freebsd/crypto/cast.h
diff --git a/include_bsd/crypto/castsb.h b/include/freebsd/crypto/castsb.h
similarity index 100%
rename from include_bsd/crypto/castsb.h
rename to include/freebsd/crypto/castsb.h
diff --git a/include_bsd/crypto/cryptodev.h b/include/freebsd/crypto/cryptodev.h
similarity index 100%
rename from include_bsd/crypto/cryptodev.h
rename to include/freebsd/crypto/cryptodev.h
diff --git a/include_bsd/crypto/cryptosoft.h b/include/freebsd/crypto/cryptosoft.h
similarity index 100%
rename from include_bsd/crypto/cryptosoft.h
rename to include/freebsd/crypto/cryptosoft.h
diff --git a/include_bsd/crypto/deflate.h b/include/freebsd/crypto/deflate.h
similarity index 100%
rename from include_bsd/crypto/deflate.h
rename to include/freebsd/crypto/deflate.h
diff --git a/include_bsd/crypto/gfmult.h b/include/freebsd/crypto/gfmult.h
similarity index 100%
rename from include_bsd/crypto/gfmult.h
rename to include/freebsd/crypto/gfmult.h
diff --git a/include_bsd/crypto/gmac.h b/include/freebsd/crypto/gmac.h
similarity index 100%
rename from include_bsd/crypto/gmac.h
rename to include/freebsd/crypto/gmac.h
diff --git a/include_bsd/crypto/rijndael.h b/include/freebsd/crypto/rijndael.h
similarity index 100%
rename from include_bsd/crypto/rijndael.h
rename to include/freebsd/crypto/rijndael.h
diff --git a/include_bsd/crypto/rmd160.h b/include/freebsd/crypto/rmd160.h
similarity index 100%
rename from include_bsd/crypto/rmd160.h
rename to include/freebsd/crypto/rmd160.h
diff --git a/include_bsd/crypto/skipjack.h b/include/freebsd/crypto/skipjack.h
similarity index 100%
rename from include_bsd/crypto/skipjack.h
rename to include/freebsd/crypto/skipjack.h
diff --git a/include_bsd/crypto/xform.h b/include/freebsd/crypto/xform.h
similarity index 100%
rename from include_bsd/crypto/xform.h
rename to include/freebsd/crypto/xform.h
diff --git a/include_bsd/crypto/xform_auth.h b/include/freebsd/crypto/xform_auth.h
similarity index 100%
rename from include_bsd/crypto/xform_auth.h
rename to include/freebsd/crypto/xform_auth.h
diff --git a/include_bsd/crypto/xform_comp.h b/include/freebsd/crypto/xform_comp.h
similarity index 100%
rename from include_bsd/crypto/xform_comp.h
rename to include/freebsd/crypto/xform_comp.h
diff --git a/include_bsd/crypto/xform_enc.h b/include/freebsd/crypto/xform_enc.h
similarity index 100%
rename from include_bsd/crypto/xform_enc.h
rename to include/freebsd/crypto/xform_enc.h
diff --git a/include_bsd/crypto/xform_userland.h b/include/freebsd/crypto/xform_userland.h
similarity index 100%
rename from include_bsd/crypto/xform_userland.h
rename to include/freebsd/crypto/xform_userland.h
diff --git a/include_bsd/ctype.h b/include/freebsd/ctype.h
similarity index 100%
rename from include_bsd/ctype.h
rename to include/freebsd/ctype.h
diff --git a/include_bsd/curses.h b/include/freebsd/curses.h
similarity index 100%
rename from include_bsd/curses.h
rename to include/freebsd/curses.h
diff --git a/include_bsd/cuse.h b/include/freebsd/cuse.h
similarity index 100%
rename from include_bsd/cuse.h
rename to include/freebsd/cuse.h
diff --git a/include_bsd/db.h b/include/freebsd/db.h
similarity index 100%
rename from include_bsd/db.h
rename to include/freebsd/db.h
diff --git a/include_bsd/der-private.h b/include/freebsd/der-private.h
similarity index 100%
rename from include_bsd/der-private.h
rename to include/freebsd/der-private.h
diff --git a/include_bsd/der-protos.h b/include/freebsd/der-protos.h
similarity index 100%
rename from include_bsd/der-protos.h
rename to include/freebsd/der-protos.h
diff --git a/include_bsd/der.h b/include/freebsd/der.h
similarity index 100%
rename from include_bsd/der.h
rename to include/freebsd/der.h
diff --git a/include_bsd/dev/acpica/acpi_hpet.h b/include/freebsd/dev/acpica/acpi_hpet.h
similarity index 100%
rename from include_bsd/dev/acpica/acpi_hpet.h
rename to include/freebsd/dev/acpica/acpi_hpet.h
diff --git a/include_bsd/dev/acpica/acpiio.h b/include/freebsd/dev/acpica/acpiio.h
similarity index 100%
rename from include_bsd/dev/acpica/acpiio.h
rename to include/freebsd/dev/acpica/acpiio.h
diff --git a/include_bsd/dev/agp/agpreg.h b/include/freebsd/dev/agp/agpreg.h
similarity index 100%
rename from include_bsd/dev/agp/agpreg.h
rename to include/freebsd/dev/agp/agpreg.h
diff --git a/include_bsd/dev/an/if_aironet_ieee.h b/include/freebsd/dev/an/if_aironet_ieee.h
similarity index 100%
rename from include_bsd/dev/an/if_aironet_ieee.h
rename to include/freebsd/dev/an/if_aironet_ieee.h
diff --git a/include_bsd/dev/an/if_anreg.h b/include/freebsd/dev/an/if_anreg.h
similarity index 100%
rename from include_bsd/dev/an/if_anreg.h
rename to include/freebsd/dev/an/if_anreg.h
diff --git a/include_bsd/dev/bktr/ioctl_bt848.h b/include/freebsd/dev/bktr/ioctl_bt848.h
similarity index 100%
rename from include_bsd/dev/bktr/ioctl_bt848.h
rename to include/freebsd/dev/bktr/ioctl_bt848.h
diff --git a/include_bsd/dev/bktr/ioctl_meteor.h b/include/freebsd/dev/bktr/ioctl_meteor.h
similarity index 100%
rename from include_bsd/dev/bktr/ioctl_meteor.h
rename to include/freebsd/dev/bktr/ioctl_meteor.h
diff --git a/include_bsd/dev/ciss/cissio.h b/include/freebsd/dev/ciss/cissio.h
similarity index 100%
rename from include_bsd/dev/ciss/cissio.h
rename to include/freebsd/dev/ciss/cissio.h
diff --git a/include_bsd/dev/ciss/cissreg.h b/include/freebsd/dev/ciss/cissreg.h
similarity index 100%
rename from include_bsd/dev/ciss/cissreg.h
rename to include/freebsd/dev/ciss/cissreg.h
diff --git a/include_bsd/dev/ciss/cissvar.h b/include/freebsd/dev/ciss/cissvar.h
similarity index 100%
rename from include_bsd/dev/ciss/cissvar.h
rename to include/freebsd/dev/ciss/cissvar.h
diff --git a/include_bsd/dev/filemon/filemon.h b/include/freebsd/dev/filemon/filemon.h
similarity index 100%
rename from include_bsd/dev/filemon/filemon.h
rename to include/freebsd/dev/filemon/filemon.h
diff --git a/include_bsd/dev/firewire/firewire.h b/include/freebsd/dev/firewire/firewire.h
similarity index 100%
rename from include_bsd/dev/firewire/firewire.h
rename to include/freebsd/dev/firewire/firewire.h
diff --git a/include_bsd/dev/firewire/firewire_phy.h b/include/freebsd/dev/firewire/firewire_phy.h
similarity index 100%
rename from include_bsd/dev/firewire/firewire_phy.h
rename to include/freebsd/dev/firewire/firewire_phy.h
diff --git a/include_bsd/dev/firewire/firewirereg.h b/include/freebsd/dev/firewire/firewirereg.h
similarity index 100%
rename from include_bsd/dev/firewire/firewirereg.h
rename to include/freebsd/dev/firewire/firewirereg.h
diff --git a/include_bsd/dev/firewire/fwdma.h b/include/freebsd/dev/firewire/fwdma.h
similarity index 100%
rename from include_bsd/dev/firewire/fwdma.h
rename to include/freebsd/dev/firewire/fwdma.h
diff --git a/include_bsd/dev/firewire/fwmem.h b/include/freebsd/dev/firewire/fwmem.h
similarity index 100%
rename from include_bsd/dev/firewire/fwmem.h
rename to include/freebsd/dev/firewire/fwmem.h
diff --git a/include_bsd/dev/firewire/fwohcireg.h b/include/freebsd/dev/firewire/fwohcireg.h
similarity index 100%
rename from include_bsd/dev/firewire/fwohcireg.h
rename to include/freebsd/dev/firewire/fwohcireg.h
diff --git a/include_bsd/dev/firewire/fwohcivar.h b/include/freebsd/dev/firewire/fwohcivar.h
similarity index 100%
rename from include_bsd/dev/firewire/fwohcivar.h
rename to include/freebsd/dev/firewire/fwohcivar.h
diff --git a/include_bsd/dev/firewire/fwphyreg.h b/include/freebsd/dev/firewire/fwphyreg.h
similarity index 100%
rename from include_bsd/dev/firewire/fwphyreg.h
rename to include/freebsd/dev/firewire/fwphyreg.h
diff --git a/include_bsd/dev/firewire/iec13213.h b/include/freebsd/dev/firewire/iec13213.h
similarity index 100%
rename from include_bsd/dev/firewire/iec13213.h
rename to include/freebsd/dev/firewire/iec13213.h
diff --git a/include_bsd/dev/firewire/iec68113.h b/include/freebsd/dev/firewire/iec68113.h
similarity index 100%
rename from include_bsd/dev/firewire/iec68113.h
rename to include/freebsd/dev/firewire/iec68113.h
diff --git a/include_bsd/dev/firewire/if_fwevar.h b/include/freebsd/dev/firewire/if_fwevar.h
similarity index 100%
rename from include_bsd/dev/firewire/if_fwevar.h
rename to include/freebsd/dev/firewire/if_fwevar.h
diff --git a/include_bsd/dev/firewire/if_fwipvar.h b/include/freebsd/dev/firewire/if_fwipvar.h
similarity index 100%
rename from include_bsd/dev/firewire/if_fwipvar.h
rename to include/freebsd/dev/firewire/if_fwipvar.h
diff --git a/include_bsd/dev/firewire/sbp.h b/include/freebsd/dev/firewire/sbp.h
similarity index 100%
rename from include_bsd/dev/firewire/sbp.h
rename to include/freebsd/dev/firewire/sbp.h
diff --git a/include_bsd/dev/hwpmc/hwpmc_amd.h b/include/freebsd/dev/hwpmc/hwpmc_amd.h
similarity index 100%
rename from include_bsd/dev/hwpmc/hwpmc_amd.h
rename to include/freebsd/dev/hwpmc/hwpmc_amd.h
diff --git a/include_bsd/dev/hwpmc/hwpmc_arm64.h b/include/freebsd/dev/hwpmc/hwpmc_arm64.h
similarity index 100%
rename from include_bsd/dev/hwpmc/hwpmc_arm64.h
rename to include/freebsd/dev/hwpmc/hwpmc_arm64.h
diff --git a/include_bsd/dev/hwpmc/hwpmc_armv7.h b/include/freebsd/dev/hwpmc/hwpmc_armv7.h
similarity index 100%
rename from include_bsd/dev/hwpmc/hwpmc_armv7.h
rename to include/freebsd/dev/hwpmc/hwpmc_armv7.h
diff --git a/include_bsd/dev/hwpmc/hwpmc_core.h b/include/freebsd/dev/hwpmc/hwpmc_core.h
similarity index 100%
rename from include_bsd/dev/hwpmc/hwpmc_core.h
rename to include/freebsd/dev/hwpmc/hwpmc_core.h
diff --git a/include_bsd/dev/hwpmc/hwpmc_pentium.h b/include/freebsd/dev/hwpmc/hwpmc_pentium.h
similarity index 100%
rename from include_bsd/dev/hwpmc/hwpmc_pentium.h
rename to include/freebsd/dev/hwpmc/hwpmc_pentium.h
diff --git a/include_bsd/dev/hwpmc/hwpmc_piv.h b/include/freebsd/dev/hwpmc/hwpmc_piv.h
similarity index 100%
rename from include_bsd/dev/hwpmc/hwpmc_piv.h
rename to include/freebsd/dev/hwpmc/hwpmc_piv.h
diff --git a/include_bsd/dev/hwpmc/hwpmc_powerpc.h b/include/freebsd/dev/hwpmc/hwpmc_powerpc.h
similarity index 100%
rename from include_bsd/dev/hwpmc/hwpmc_powerpc.h
rename to include/freebsd/dev/hwpmc/hwpmc_powerpc.h
diff --git a/include_bsd/dev/hwpmc/hwpmc_ppro.h b/include/freebsd/dev/hwpmc/hwpmc_ppro.h
similarity index 100%
rename from include_bsd/dev/hwpmc/hwpmc_ppro.h
rename to include/freebsd/dev/hwpmc/hwpmc_ppro.h
diff --git a/include_bsd/dev/hwpmc/hwpmc_riscv.h b/include/freebsd/dev/hwpmc/hwpmc_riscv.h
similarity index 100%
rename from include_bsd/dev/hwpmc/hwpmc_riscv.h
rename to include/freebsd/dev/hwpmc/hwpmc_riscv.h
diff --git a/include_bsd/dev/hwpmc/hwpmc_soft.h b/include/freebsd/dev/hwpmc/hwpmc_soft.h
similarity index 100%
rename from include_bsd/dev/hwpmc/hwpmc_soft.h
rename to include/freebsd/dev/hwpmc/hwpmc_soft.h
diff --git a/include_bsd/dev/hwpmc/hwpmc_tsc.h b/include/freebsd/dev/hwpmc/hwpmc_tsc.h
similarity index 100%
rename from include_bsd/dev/hwpmc/hwpmc_tsc.h
rename to include/freebsd/dev/hwpmc/hwpmc_tsc.h
diff --git a/include_bsd/dev/hwpmc/hwpmc_uncore.h b/include/freebsd/dev/hwpmc/hwpmc_uncore.h
similarity index 100%
rename from include_bsd/dev/hwpmc/hwpmc_uncore.h
rename to include/freebsd/dev/hwpmc/hwpmc_uncore.h
diff --git a/include_bsd/dev/hwpmc/hwpmc_xscale.h b/include/freebsd/dev/hwpmc/hwpmc_xscale.h
similarity index 100%
rename from include_bsd/dev/hwpmc/hwpmc_xscale.h
rename to include/freebsd/dev/hwpmc/hwpmc_xscale.h
diff --git a/include_bsd/dev/hwpmc/pmc_events.h b/include/freebsd/dev/hwpmc/pmc_events.h
similarity index 100%
rename from include_bsd/dev/hwpmc/pmc_events.h
rename to include/freebsd/dev/hwpmc/pmc_events.h
diff --git a/include_bsd/dev/ic/cd1400.h b/include/freebsd/dev/ic/cd1400.h
similarity index 100%
rename from include_bsd/dev/ic/cd1400.h
rename to include/freebsd/dev/ic/cd1400.h
diff --git a/include_bsd/dev/ic/cd180.h b/include/freebsd/dev/ic/cd180.h
similarity index 100%
rename from include_bsd/dev/ic/cd180.h
rename to include/freebsd/dev/ic/cd180.h
diff --git a/include_bsd/dev/ic/esp.h b/include/freebsd/dev/ic/esp.h
similarity index 100%
rename from include_bsd/dev/ic/esp.h
rename to include/freebsd/dev/ic/esp.h
diff --git a/include_bsd/dev/ic/i8237.h b/include/freebsd/dev/ic/i8237.h
similarity index 100%
rename from include_bsd/dev/ic/i8237.h
rename to include/freebsd/dev/ic/i8237.h
diff --git a/include_bsd/dev/ic/i8251.h b/include/freebsd/dev/ic/i8251.h
similarity index 100%
rename from include_bsd/dev/ic/i8251.h
rename to include/freebsd/dev/ic/i8251.h
diff --git a/include_bsd/dev/ic/i8253reg.h b/include/freebsd/dev/ic/i8253reg.h
similarity index 100%
rename from include_bsd/dev/ic/i8253reg.h
rename to include/freebsd/dev/ic/i8253reg.h
diff --git a/include_bsd/dev/ic/i8255.h b/include/freebsd/dev/ic/i8255.h
similarity index 100%
rename from include_bsd/dev/ic/i8255.h
rename to include/freebsd/dev/ic/i8255.h
diff --git a/include_bsd/dev/ic/i82586.h b/include/freebsd/dev/ic/i82586.h
similarity index 100%
rename from include_bsd/dev/ic/i82586.h
rename to include/freebsd/dev/ic/i82586.h
diff --git a/include_bsd/dev/ic/i8259.h b/include/freebsd/dev/ic/i8259.h
similarity index 100%
rename from include_bsd/dev/ic/i8259.h
rename to include/freebsd/dev/ic/i8259.h
diff --git a/include_bsd/dev/ic/nec765.h b/include/freebsd/dev/ic/nec765.h
similarity index 100%
rename from include_bsd/dev/ic/nec765.h
rename to include/freebsd/dev/ic/nec765.h
diff --git a/include_bsd/dev/ic/ns16550.h b/include/freebsd/dev/ic/ns16550.h
similarity index 100%
rename from include_bsd/dev/ic/ns16550.h
rename to include/freebsd/dev/ic/ns16550.h
diff --git a/include_bsd/dev/ic/quicc.h b/include/freebsd/dev/ic/quicc.h
similarity index 100%
rename from include_bsd/dev/ic/quicc.h
rename to include/freebsd/dev/ic/quicc.h
diff --git a/include_bsd/dev/ic/rsa.h b/include/freebsd/dev/ic/rsa.h
similarity index 100%
rename from include_bsd/dev/ic/rsa.h
rename to include/freebsd/dev/ic/rsa.h
diff --git a/include_bsd/dev/ic/sab82532.h b/include/freebsd/dev/ic/sab82532.h
similarity index 100%
rename from include_bsd/dev/ic/sab82532.h
rename to include/freebsd/dev/ic/sab82532.h
diff --git a/include_bsd/dev/ic/via6522reg.h b/include/freebsd/dev/ic/via6522reg.h
similarity index 100%
rename from include_bsd/dev/ic/via6522reg.h
rename to include/freebsd/dev/ic/via6522reg.h
diff --git a/include_bsd/dev/ic/wd33c93reg.h b/include/freebsd/dev/ic/wd33c93reg.h
similarity index 100%
rename from include_bsd/dev/ic/wd33c93reg.h
rename to include/freebsd/dev/ic/wd33c93reg.h
diff --git a/include_bsd/dev/ic/z8530.h b/include/freebsd/dev/ic/z8530.h
similarity index 100%
rename from include_bsd/dev/ic/z8530.h
rename to include/freebsd/dev/ic/z8530.h
diff --git a/include_bsd/dev/iicbus/ds1307reg.h b/include/freebsd/dev/iicbus/ds1307reg.h
similarity index 100%
rename from include_bsd/dev/iicbus/ds1307reg.h
rename to include/freebsd/dev/iicbus/ds1307reg.h
diff --git a/include_bsd/dev/iicbus/ds3231reg.h b/include/freebsd/dev/iicbus/ds3231reg.h
similarity index 100%
rename from include_bsd/dev/iicbus/ds3231reg.h
rename to include/freebsd/dev/iicbus/ds3231reg.h
diff --git a/include_bsd/dev/iicbus/iic.h b/include/freebsd/dev/iicbus/iic.h
similarity index 100%
rename from include_bsd/dev/iicbus/iic.h
rename to include/freebsd/dev/iicbus/iic.h
diff --git a/include_bsd/dev/iicbus/iicbus.h b/include/freebsd/dev/iicbus/iicbus.h
similarity index 100%
rename from include_bsd/dev/iicbus/iicbus.h
rename to include/freebsd/dev/iicbus/iicbus.h
diff --git a/include_bsd/dev/iicbus/iicoc.h b/include/freebsd/dev/iicbus/iicoc.h
similarity index 100%
rename from include_bsd/dev/iicbus/iicoc.h
rename to include/freebsd/dev/iicbus/iicoc.h
diff --git a/include_bsd/dev/iicbus/iiconf.h b/include/freebsd/dev/iicbus/iiconf.h
similarity index 100%
rename from include_bsd/dev/iicbus/iiconf.h
rename to include/freebsd/dev/iicbus/iiconf.h
diff --git a/include_bsd/dev/iicbus/pcf8563reg.h b/include/freebsd/dev/iicbus/pcf8563reg.h
similarity index 100%
rename from include_bsd/dev/iicbus/pcf8563reg.h
rename to include/freebsd/dev/iicbus/pcf8563reg.h
diff --git a/include_bsd/dev/io/iodev.h b/include/freebsd/dev/io/iodev.h
similarity index 100%
rename from include_bsd/dev/io/iodev.h
rename to include/freebsd/dev/io/iodev.h
diff --git a/include_bsd/dev/lmc/if_lmc.h b/include/freebsd/dev/lmc/if_lmc.h
similarity index 100%
rename from include_bsd/dev/lmc/if_lmc.h
rename to include/freebsd/dev/lmc/if_lmc.h
diff --git a/include_bsd/dev/mfi/mfi_ioctl.h b/include/freebsd/dev/mfi/mfi_ioctl.h
similarity index 100%
rename from include_bsd/dev/mfi/mfi_ioctl.h
rename to include/freebsd/dev/mfi/mfi_ioctl.h
diff --git a/include_bsd/dev/mfi/mfireg.h b/include/freebsd/dev/mfi/mfireg.h
similarity index 100%
rename from include_bsd/dev/mfi/mfireg.h
rename to include/freebsd/dev/mfi/mfireg.h
diff --git a/include_bsd/dev/mfi/mfivar.h b/include/freebsd/dev/mfi/mfivar.h
similarity index 100%
rename from include_bsd/dev/mfi/mfivar.h
rename to include/freebsd/dev/mfi/mfivar.h
diff --git a/include_bsd/dev/mpt/mpilib/mpi.h b/include/freebsd/dev/mpt/mpilib/mpi.h
similarity index 100%
rename from include_bsd/dev/mpt/mpilib/mpi.h
rename to include/freebsd/dev/mpt/mpilib/mpi.h
diff --git a/include_bsd/dev/mpt/mpilib/mpi_cnfg.h b/include/freebsd/dev/mpt/mpilib/mpi_cnfg.h
similarity index 100%
rename from include_bsd/dev/mpt/mpilib/mpi_cnfg.h
rename to include/freebsd/dev/mpt/mpilib/mpi_cnfg.h
diff --git a/include_bsd/dev/mpt/mpilib/mpi_fc.h b/include/freebsd/dev/mpt/mpilib/mpi_fc.h
similarity index 100%
rename from include_bsd/dev/mpt/mpilib/mpi_fc.h
rename to include/freebsd/dev/mpt/mpilib/mpi_fc.h
diff --git a/include_bsd/dev/mpt/mpilib/mpi_init.h b/include/freebsd/dev/mpt/mpilib/mpi_init.h
similarity index 100%
rename from include_bsd/dev/mpt/mpilib/mpi_init.h
rename to include/freebsd/dev/mpt/mpilib/mpi_init.h
diff --git a/include_bsd/dev/mpt/mpilib/mpi_ioc.h b/include/freebsd/dev/mpt/mpilib/mpi_ioc.h
similarity index 100%
rename from include_bsd/dev/mpt/mpilib/mpi_ioc.h
rename to include/freebsd/dev/mpt/mpilib/mpi_ioc.h
diff --git a/include_bsd/dev/mpt/mpilib/mpi_lan.h b/include/freebsd/dev/mpt/mpilib/mpi_lan.h
similarity index 100%
rename from include_bsd/dev/mpt/mpilib/mpi_lan.h
rename to include/freebsd/dev/mpt/mpilib/mpi_lan.h
diff --git a/include_bsd/dev/mpt/mpilib/mpi_log_fc.h b/include/freebsd/dev/mpt/mpilib/mpi_log_fc.h
similarity index 100%
rename from include_bsd/dev/mpt/mpilib/mpi_log_fc.h
rename to include/freebsd/dev/mpt/mpilib/mpi_log_fc.h
diff --git a/include_bsd/dev/mpt/mpilib/mpi_log_sas.h b/include/freebsd/dev/mpt/mpilib/mpi_log_sas.h
similarity index 100%
rename from include_bsd/dev/mpt/mpilib/mpi_log_sas.h
rename to include/freebsd/dev/mpt/mpilib/mpi_log_sas.h
diff --git a/include_bsd/dev/mpt/mpilib/mpi_raid.h b/include/freebsd/dev/mpt/mpilib/mpi_raid.h
similarity index 100%
rename from include_bsd/dev/mpt/mpilib/mpi_raid.h
rename to include/freebsd/dev/mpt/mpilib/mpi_raid.h
diff --git a/include_bsd/dev/mpt/mpilib/mpi_sas.h b/include/freebsd/dev/mpt/mpilib/mpi_sas.h
similarity index 100%
rename from include_bsd/dev/mpt/mpilib/mpi_sas.h
rename to include/freebsd/dev/mpt/mpilib/mpi_sas.h
diff --git a/include_bsd/dev/mpt/mpilib/mpi_targ.h b/include/freebsd/dev/mpt/mpilib/mpi_targ.h
similarity index 100%
rename from include_bsd/dev/mpt/mpilib/mpi_targ.h
rename to include/freebsd/dev/mpt/mpilib/mpi_targ.h
diff --git a/include_bsd/dev/mpt/mpilib/mpi_tool.h b/include/freebsd/dev/mpt/mpilib/mpi_tool.h
similarity index 100%
rename from include_bsd/dev/mpt/mpilib/mpi_tool.h
rename to include/freebsd/dev/mpt/mpilib/mpi_tool.h
diff --git a/include_bsd/dev/mpt/mpilib/mpi_type.h b/include/freebsd/dev/mpt/mpilib/mpi_type.h
similarity index 100%
rename from include_bsd/dev/mpt/mpilib/mpi_type.h
rename to include/freebsd/dev/mpt/mpilib/mpi_type.h
diff --git a/include_bsd/dev/nvme/nvme.h b/include/freebsd/dev/nvme/nvme.h
similarity index 100%
rename from include_bsd/dev/nvme/nvme.h
rename to include/freebsd/dev/nvme/nvme.h
diff --git a/include_bsd/dev/nvme/nvme_private.h b/include/freebsd/dev/nvme/nvme_private.h
similarity index 100%
rename from include_bsd/dev/nvme/nvme_private.h
rename to include/freebsd/dev/nvme/nvme_private.h
diff --git a/include_bsd/dev/ofw/ofw_bus.h b/include/freebsd/dev/ofw/ofw_bus.h
similarity index 100%
rename from include_bsd/dev/ofw/ofw_bus.h
rename to include/freebsd/dev/ofw/ofw_bus.h
diff --git a/include_bsd/dev/ofw/ofw_bus_subr.h b/include/freebsd/dev/ofw/ofw_bus_subr.h
similarity index 100%
rename from include_bsd/dev/ofw/ofw_bus_subr.h
rename to include/freebsd/dev/ofw/ofw_bus_subr.h
diff --git a/include_bsd/dev/ofw/ofw_cpu.h b/include/freebsd/dev/ofw/ofw_cpu.h
similarity index 100%
rename from include_bsd/dev/ofw/ofw_cpu.h
rename to include/freebsd/dev/ofw/ofw_cpu.h
diff --git a/include_bsd/dev/ofw/ofw_pci.h b/include/freebsd/dev/ofw/ofw_pci.h
similarity index 100%
rename from include_bsd/dev/ofw/ofw_pci.h
rename to include/freebsd/dev/ofw/ofw_pci.h
diff --git a/include_bsd/dev/ofw/ofw_subr.h b/include/freebsd/dev/ofw/ofw_subr.h
similarity index 100%
rename from include_bsd/dev/ofw/ofw_subr.h
rename to include/freebsd/dev/ofw/ofw_subr.h
diff --git a/include_bsd/dev/ofw/ofwpci.h b/include/freebsd/dev/ofw/ofwpci.h
similarity index 100%
rename from include_bsd/dev/ofw/ofwpci.h
rename to include/freebsd/dev/ofw/ofwpci.h
diff --git a/include_bsd/dev/ofw/ofwvar.h b/include/freebsd/dev/ofw/ofwvar.h
similarity index 100%
rename from include_bsd/dev/ofw/ofwvar.h
rename to include/freebsd/dev/ofw/ofwvar.h
diff --git a/include_bsd/dev/ofw/openfirm.h b/include/freebsd/dev/ofw/openfirm.h
similarity index 100%
rename from include_bsd/dev/ofw/openfirm.h
rename to include/freebsd/dev/ofw/openfirm.h
diff --git a/include_bsd/dev/ofw/openfirmio.h b/include/freebsd/dev/ofw/openfirmio.h
similarity index 100%
rename from include_bsd/dev/ofw/openfirmio.h
rename to include/freebsd/dev/ofw/openfirmio.h
diff --git a/include_bsd/dev/ofw/openpromio.h b/include/freebsd/dev/ofw/openpromio.h
similarity index 100%
rename from include_bsd/dev/ofw/openpromio.h
rename to include/freebsd/dev/ofw/openpromio.h
diff --git a/include_bsd/dev/pbio/pbioio.h b/include/freebsd/dev/pbio/pbioio.h
similarity index 100%
rename from include_bsd/dev/pbio/pbioio.h
rename to include/freebsd/dev/pbio/pbioio.h
diff --git a/include_bsd/dev/pci/pcireg.h b/include/freebsd/dev/pci/pcireg.h
similarity index 100%
rename from include_bsd/dev/pci/pcireg.h
rename to include/freebsd/dev/pci/pcireg.h
diff --git a/include_bsd/dev/ppbus/lpt.h b/include/freebsd/dev/ppbus/lpt.h
similarity index 100%
rename from include_bsd/dev/ppbus/lpt.h
rename to include/freebsd/dev/ppbus/lpt.h
diff --git a/include_bsd/dev/ppbus/lptio.h b/include/freebsd/dev/ppbus/lptio.h
similarity index 100%
rename from include_bsd/dev/ppbus/lptio.h
rename to include/freebsd/dev/ppbus/lptio.h
diff --git a/include_bsd/dev/ppbus/ppb_1284.h b/include/freebsd/dev/ppbus/ppb_1284.h
similarity index 100%
rename from include_bsd/dev/ppbus/ppb_1284.h
rename to include/freebsd/dev/ppbus/ppb_1284.h
diff --git a/include_bsd/dev/ppbus/ppb_msq.h b/include/freebsd/dev/ppbus/ppb_msq.h
similarity index 100%
rename from include_bsd/dev/ppbus/ppb_msq.h
rename to include/freebsd/dev/ppbus/ppb_msq.h
diff --git a/include_bsd/dev/ppbus/ppbconf.h b/include/freebsd/dev/ppbus/ppbconf.h
similarity index 100%
rename from include_bsd/dev/ppbus/ppbconf.h
rename to include/freebsd/dev/ppbus/ppbconf.h
diff --git a/include_bsd/dev/ppbus/ppbio.h b/include/freebsd/dev/ppbus/ppbio.h
similarity index 100%
rename from include_bsd/dev/ppbus/ppbio.h
rename to include/freebsd/dev/ppbus/ppbio.h
diff --git a/include_bsd/dev/ppbus/ppi.h b/include/freebsd/dev/ppbus/ppi.h
similarity index 100%
rename from include_bsd/dev/ppbus/ppi.h
rename to include/freebsd/dev/ppbus/ppi.h
diff --git a/include_bsd/dev/ppbus/vpoio.h b/include/freebsd/dev/ppbus/vpoio.h
similarity index 100%
rename from include_bsd/dev/ppbus/vpoio.h
rename to include/freebsd/dev/ppbus/vpoio.h
diff --git a/include_bsd/dev/smbus/smb.h b/include/freebsd/dev/smbus/smb.h
similarity index 100%
rename from include_bsd/dev/smbus/smb.h
rename to include/freebsd/dev/smbus/smb.h
diff --git a/include_bsd/dev/smbus/smbconf.h b/include/freebsd/dev/smbus/smbconf.h
similarity index 100%
rename from include_bsd/dev/smbus/smbconf.h
rename to include/freebsd/dev/smbus/smbconf.h
diff --git a/include_bsd/dev/smbus/smbus.h b/include/freebsd/dev/smbus/smbus.h
similarity index 100%
rename from include_bsd/dev/smbus/smbus.h
rename to include/freebsd/dev/smbus/smbus.h
diff --git a/include_bsd/dev/speaker/speaker.h b/include/freebsd/dev/speaker/speaker.h
similarity index 100%
rename from include_bsd/dev/speaker/speaker.h
rename to include/freebsd/dev/speaker/speaker.h
diff --git a/include_bsd/dev/usb/ufm_ioctl.h b/include/freebsd/dev/usb/ufm_ioctl.h
similarity index 100%
rename from include_bsd/dev/usb/ufm_ioctl.h
rename to include/freebsd/dev/usb/ufm_ioctl.h
diff --git a/include_bsd/dev/usb/uftdiio.h b/include/freebsd/dev/usb/uftdiio.h
similarity index 100%
rename from include_bsd/dev/usb/uftdiio.h
rename to include/freebsd/dev/usb/uftdiio.h
diff --git a/include_bsd/dev/usb/uled_ioctl.h b/include/freebsd/dev/usb/uled_ioctl.h
similarity index 100%
rename from include_bsd/dev/usb/uled_ioctl.h
rename to include/freebsd/dev/usb/uled_ioctl.h
diff --git a/include_bsd/dev/usb/usb.h b/include/freebsd/dev/usb/usb.h
similarity index 100%
rename from include_bsd/dev/usb/usb.h
rename to include/freebsd/dev/usb/usb.h
diff --git a/include_bsd/dev/usb/usb_bus.h b/include/freebsd/dev/usb/usb_bus.h
similarity index 100%
rename from include_bsd/dev/usb/usb_bus.h
rename to include/freebsd/dev/usb/usb_bus.h
diff --git a/include_bsd/dev/usb/usb_busdma.h b/include/freebsd/dev/usb/usb_busdma.h
similarity index 100%
rename from include_bsd/dev/usb/usb_busdma.h
rename to include/freebsd/dev/usb/usb_busdma.h
diff --git a/include_bsd/dev/usb/usb_cdc.h b/include/freebsd/dev/usb/usb_cdc.h
similarity index 100%
rename from include_bsd/dev/usb/usb_cdc.h
rename to include/freebsd/dev/usb/usb_cdc.h
diff --git a/include_bsd/dev/usb/usb_controller.h b/include/freebsd/dev/usb/usb_controller.h
similarity index 100%
rename from include_bsd/dev/usb/usb_controller.h
rename to include/freebsd/dev/usb/usb_controller.h
diff --git a/include_bsd/dev/usb/usb_core.h b/include/freebsd/dev/usb/usb_core.h
similarity index 100%
rename from include_bsd/dev/usb/usb_core.h
rename to include/freebsd/dev/usb/usb_core.h
diff --git a/include_bsd/dev/usb/usb_debug.h b/include/freebsd/dev/usb/usb_debug.h
similarity index 100%
rename from include_bsd/dev/usb/usb_debug.h
rename to include/freebsd/dev/usb/usb_debug.h
diff --git a/include_bsd/dev/usb/usb_dev.h b/include/freebsd/dev/usb/usb_dev.h
similarity index 100%
rename from include_bsd/dev/usb/usb_dev.h
rename to include/freebsd/dev/usb/usb_dev.h
diff --git a/include_bsd/dev/usb/usb_device.h b/include/freebsd/dev/usb/usb_device.h
similarity index 100%
rename from include_bsd/dev/usb/usb_device.h
rename to include/freebsd/dev/usb/usb_device.h
diff --git a/include_bsd/dev/usb/usb_dynamic.h b/include/freebsd/dev/usb/usb_dynamic.h
similarity index 100%
rename from include_bsd/dev/usb/usb_dynamic.h
rename to include/freebsd/dev/usb/usb_dynamic.h
diff --git a/include_bsd/dev/usb/usb_endian.h b/include/freebsd/dev/usb/usb_endian.h
similarity index 100%
rename from include_bsd/dev/usb/usb_endian.h
rename to include/freebsd/dev/usb/usb_endian.h
diff --git a/include_bsd/dev/usb/usb_freebsd.h b/include/freebsd/dev/usb/usb_freebsd.h
similarity index 100%
rename from include_bsd/dev/usb/usb_freebsd.h
rename to include/freebsd/dev/usb/usb_freebsd.h
diff --git a/include_bsd/dev/usb/usb_freebsd_loader.h b/include/freebsd/dev/usb/usb_freebsd_loader.h
similarity index 100%
rename from include_bsd/dev/usb/usb_freebsd_loader.h
rename to include/freebsd/dev/usb/usb_freebsd_loader.h
diff --git a/include_bsd/dev/usb/usb_generic.h b/include/freebsd/dev/usb/usb_generic.h
similarity index 100%
rename from include_bsd/dev/usb/usb_generic.h
rename to include/freebsd/dev/usb/usb_generic.h
diff --git a/include_bsd/dev/usb/usb_hub.h b/include/freebsd/dev/usb/usb_hub.h
similarity index 100%
rename from include_bsd/dev/usb/usb_hub.h
rename to include/freebsd/dev/usb/usb_hub.h
diff --git a/include_bsd/dev/usb/usb_ioctl.h b/include/freebsd/dev/usb/usb_ioctl.h
similarity index 100%
rename from include_bsd/dev/usb/usb_ioctl.h
rename to include/freebsd/dev/usb/usb_ioctl.h
diff --git a/include_bsd/dev/usb/usb_mbuf.h b/include/freebsd/dev/usb/usb_mbuf.h
similarity index 100%
rename from include_bsd/dev/usb/usb_mbuf.h
rename to include/freebsd/dev/usb/usb_mbuf.h
diff --git a/include_bsd/dev/usb/usb_msctest.h b/include/freebsd/dev/usb/usb_msctest.h
similarity index 100%
rename from include_bsd/dev/usb/usb_msctest.h
rename to include/freebsd/dev/usb/usb_msctest.h
diff --git a/include_bsd/dev/usb/usb_pci.h b/include/freebsd/dev/usb/usb_pci.h
similarity index 100%
rename from include_bsd/dev/usb/usb_pci.h
rename to include/freebsd/dev/usb/usb_pci.h
diff --git a/include_bsd/dev/usb/usb_pf.h b/include/freebsd/dev/usb/usb_pf.h
similarity index 100%
rename from include_bsd/dev/usb/usb_pf.h
rename to include/freebsd/dev/usb/usb_pf.h
diff --git a/include_bsd/dev/usb/usb_process.h b/include/freebsd/dev/usb/usb_process.h
similarity index 100%
rename from include_bsd/dev/usb/usb_process.h
rename to include/freebsd/dev/usb/usb_process.h
diff --git a/include_bsd/dev/usb/usb_request.h b/include/freebsd/dev/usb/usb_request.h
similarity index 100%
rename from include_bsd/dev/usb/usb_request.h
rename to include/freebsd/dev/usb/usb_request.h
diff --git a/include_bsd/dev/usb/usb_transfer.h b/include/freebsd/dev/usb/usb_transfer.h
similarity index 100%
rename from include_bsd/dev/usb/usb_transfer.h
rename to include/freebsd/dev/usb/usb_transfer.h
diff --git a/include_bsd/dev/usb/usb_util.h b/include/freebsd/dev/usb/usb_util.h
similarity index 100%
rename from include_bsd/dev/usb/usb_util.h
rename to include/freebsd/dev/usb/usb_util.h
diff --git a/include_bsd/dev/usb/usbdi.h b/include/freebsd/dev/usb/usbdi.h
similarity index 100%
rename from include_bsd/dev/usb/usbdi.h
rename to include/freebsd/dev/usb/usbdi.h
diff --git a/include_bsd/dev/usb/usbdi_util.h b/include/freebsd/dev/usb/usbdi_util.h
similarity index 100%
rename from include_bsd/dev/usb/usbdi_util.h
rename to include/freebsd/dev/usb/usbdi_util.h
diff --git a/include_bsd/dev/usb/usbhid.h b/include/freebsd/dev/usb/usbhid.h
similarity index 100%
rename from include_bsd/dev/usb/usbhid.h
rename to include/freebsd/dev/usb/usbhid.h
diff --git a/include_bsd/dev/utopia/idtphy.h b/include/freebsd/dev/utopia/idtphy.h
similarity index 100%
rename from include_bsd/dev/utopia/idtphy.h
rename to include/freebsd/dev/utopia/idtphy.h
diff --git a/include_bsd/dev/utopia/suni.h b/include/freebsd/dev/utopia/suni.h
similarity index 100%
rename from include_bsd/dev/utopia/suni.h
rename to include/freebsd/dev/utopia/suni.h
diff --git a/include_bsd/dev/utopia/utopia.h b/include/freebsd/dev/utopia/utopia.h
similarity index 100%
rename from include_bsd/dev/utopia/utopia.h
rename to include/freebsd/dev/utopia/utopia.h
diff --git a/include_bsd/dev/utopia/utopia_priv.h b/include/freebsd/dev/utopia/utopia_priv.h
similarity index 100%
rename from include_bsd/dev/utopia/utopia_priv.h
rename to include/freebsd/dev/utopia/utopia_priv.h
diff --git a/include_bsd/dev/vkbd/vkbd_var.h b/include/freebsd/dev/vkbd/vkbd_var.h
similarity index 100%
rename from include_bsd/dev/vkbd/vkbd_var.h
rename to include/freebsd/dev/vkbd/vkbd_var.h
diff --git a/include_bsd/dev/wi/if_wavelan_ieee.h b/include/freebsd/dev/wi/if_wavelan_ieee.h
similarity index 100%
rename from include_bsd/dev/wi/if_wavelan_ieee.h
rename to include/freebsd/dev/wi/if_wavelan_ieee.h
diff --git a/include_bsd/dev/wi/if_wireg.h b/include/freebsd/dev/wi/if_wireg.h
similarity index 100%
rename from include_bsd/dev/wi/if_wireg.h
rename to include/freebsd/dev/wi/if_wireg.h
diff --git a/include_bsd/dev/wi/if_wivar.h b/include/freebsd/dev/wi/if_wivar.h
similarity index 100%
rename from include_bsd/dev/wi/if_wivar.h
rename to include/freebsd/dev/wi/if_wivar.h
diff --git a/include_bsd/devctl.h b/include/freebsd/devctl.h
similarity index 100%
rename from include_bsd/devctl.h
rename to include/freebsd/devctl.h
diff --git a/include_bsd/devdctl/consumer.h b/include/freebsd/devdctl/consumer.h
similarity index 100%
rename from include_bsd/devdctl/consumer.h
rename to include/freebsd/devdctl/consumer.h
diff --git a/include_bsd/devdctl/event.h b/include/freebsd/devdctl/event.h
similarity index 100%
rename from include_bsd/devdctl/event.h
rename to include/freebsd/devdctl/event.h
diff --git a/include_bsd/devdctl/event_factory.h b/include/freebsd/devdctl/event_factory.h
similarity index 100%
rename from include_bsd/devdctl/event_factory.h
rename to include/freebsd/devdctl/event_factory.h
diff --git a/include_bsd/devdctl/exception.h b/include/freebsd/devdctl/exception.h
similarity index 100%
rename from include_bsd/devdctl/exception.h
rename to include/freebsd/devdctl/exception.h
diff --git a/include_bsd/devdctl/guid.h b/include/freebsd/devdctl/guid.h
similarity index 100%
rename from include_bsd/devdctl/guid.h
rename to include/freebsd/devdctl/guid.h
diff --git a/include_bsd/devinfo.h b/include/freebsd/devinfo.h
similarity index 100%
rename from include_bsd/devinfo.h
rename to include/freebsd/devinfo.h
diff --git a/include_bsd/devstat.h b/include/freebsd/devstat.h
similarity index 100%
rename from include_bsd/devstat.h
rename to include/freebsd/devstat.h
diff --git a/include_bsd/dialog.h b/include/freebsd/dialog.h
similarity index 100%
rename from include_bsd/dialog.h
rename to include/freebsd/dialog.h
diff --git a/include_bsd/digest_asn1.h b/include/freebsd/digest_asn1.h
similarity index 100%
rename from include_bsd/digest_asn1.h
rename to include/freebsd/digest_asn1.h
diff --git a/include_bsd/dirent.h b/include/freebsd/dirent.h
similarity index 100%
rename from include_bsd/dirent.h
rename to include/freebsd/dirent.h
diff --git a/include_bsd/dlfcn.h b/include/freebsd/dlfcn.h
similarity index 100%
rename from include_bsd/dlfcn.h
rename to include/freebsd/dlfcn.h
diff --git a/include_bsd/dlg_colors.h b/include/freebsd/dlg_colors.h
similarity index 100%
rename from include_bsd/dlg_colors.h
rename to include/freebsd/dlg_colors.h
diff --git a/include_bsd/dlg_config.h b/include/freebsd/dlg_config.h
similarity index 100%
rename from include_bsd/dlg_config.h
rename to include/freebsd/dlg_config.h
diff --git a/include_bsd/dlg_keys.h b/include/freebsd/dlg_keys.h
similarity index 100%
rename from include_bsd/dlg_keys.h
rename to include/freebsd/dlg_keys.h
diff --git a/include_bsd/dpv.h b/include/freebsd/dpv.h
similarity index 100%
rename from include_bsd/dpv.h
rename to include/freebsd/dpv.h
diff --git a/include_bsd/dwarf.h b/include/freebsd/dwarf.h
similarity index 100%
rename from include_bsd/dwarf.h
rename to include/freebsd/dwarf.h
diff --git a/include_bsd/edit/readline/history.h b/include/freebsd/edit/readline/history.h
similarity index 100%
rename from include_bsd/edit/readline/history.h
rename to include/freebsd/edit/readline/history.h
diff --git a/include_bsd/edit/readline/readline.h b/include/freebsd/edit/readline/readline.h
similarity index 100%
rename from include_bsd/edit/readline/readline.h
rename to include/freebsd/edit/readline/readline.h
diff --git a/include_bsd/edit/readline/tilde.h b/include/freebsd/edit/readline/tilde.h
similarity index 100%
rename from include_bsd/edit/readline/tilde.h
rename to include/freebsd/edit/readline/tilde.h
diff --git a/include_bsd/elf-hints.h b/include/freebsd/elf-hints.h
similarity index 100%
rename from include_bsd/elf-hints.h
rename to include/freebsd/elf-hints.h
diff --git a/include_bsd/elf.h b/include/freebsd/elf.h
similarity index 100%
rename from include_bsd/elf.h
rename to include/freebsd/elf.h
diff --git a/include_bsd/err.h b/include/freebsd/err.h
similarity index 100%
rename from include_bsd/err.h
rename to include/freebsd/err.h
diff --git a/include_bsd/errno.h b/include/freebsd/errno.h
similarity index 100%
rename from include_bsd/errno.h
rename to include/freebsd/errno.h
diff --git a/include_bsd/eti.h b/include/freebsd/eti.h
similarity index 100%
rename from include_bsd/eti.h
rename to include/freebsd/eti.h
diff --git a/include_bsd/execinfo.h b/include/freebsd/execinfo.h
similarity index 100%
rename from include_bsd/execinfo.h
rename to include/freebsd/execinfo.h
diff --git a/include_bsd/fcntl.h b/include/freebsd/fcntl.h
similarity index 100%
rename from include_bsd/fcntl.h
rename to include/freebsd/fcntl.h
diff --git a/include_bsd/fenv.h b/include/freebsd/fenv.h
similarity index 100%
rename from include_bsd/fenv.h
rename to include/freebsd/fenv.h
diff --git a/include_bsd/fetch.h b/include/freebsd/fetch.h
similarity index 100%
rename from include_bsd/fetch.h
rename to include/freebsd/fetch.h
diff --git a/include_bsd/figpar.h b/include/freebsd/figpar.h
similarity index 100%
rename from include_bsd/figpar.h
rename to include/freebsd/figpar.h
diff --git a/include_bsd/float.h b/include/freebsd/float.h
similarity index 100%
rename from include_bsd/float.h
rename to include/freebsd/float.h
diff --git a/include_bsd/floatingpoint.h b/include/freebsd/floatingpoint.h
similarity index 100%
rename from include_bsd/floatingpoint.h
rename to include/freebsd/floatingpoint.h
diff --git a/include_bsd/fmtmsg.h b/include/freebsd/fmtmsg.h
similarity index 100%
rename from include_bsd/fmtmsg.h
rename to include/freebsd/fmtmsg.h
diff --git a/include_bsd/fnmatch.h b/include/freebsd/fnmatch.h
similarity index 100%
rename from include_bsd/fnmatch.h
rename to include/freebsd/fnmatch.h
diff --git a/include_bsd/form.h b/include/freebsd/form.h
similarity index 100%
rename from include_bsd/form.h
rename to include/freebsd/form.h
diff --git a/include_bsd/fs/cuse/cuse_defs.h b/include/freebsd/fs/cuse/cuse_defs.h
similarity index 100%
rename from include_bsd/fs/cuse/cuse_defs.h
rename to include/freebsd/fs/cuse/cuse_defs.h
diff --git a/include_bsd/fs/cuse/cuse_ioctl.h b/include/freebsd/fs/cuse/cuse_ioctl.h
similarity index 100%
rename from include_bsd/fs/cuse/cuse_ioctl.h
rename to include/freebsd/fs/cuse/cuse_ioctl.h
diff --git a/include_bsd/fs/devfs/devfs.h b/include/freebsd/fs/devfs/devfs.h
similarity index 100%
rename from include_bsd/fs/devfs/devfs.h
rename to include/freebsd/fs/devfs/devfs.h
diff --git a/include_bsd/fs/devfs/devfs_int.h b/include/freebsd/fs/devfs/devfs_int.h
similarity index 100%
rename from include_bsd/fs/devfs/devfs_int.h
rename to include/freebsd/fs/devfs/devfs_int.h
diff --git a/include_bsd/fs/fdescfs/fdesc.h b/include/freebsd/fs/fdescfs/fdesc.h
similarity index 100%
rename from include_bsd/fs/fdescfs/fdesc.h
rename to include/freebsd/fs/fdescfs/fdesc.h
diff --git a/include_bsd/fs/msdosfs/bootsect.h b/include/freebsd/fs/msdosfs/bootsect.h
similarity index 100%
rename from include_bsd/fs/msdosfs/bootsect.h
rename to include/freebsd/fs/msdosfs/bootsect.h
diff --git a/include_bsd/fs/msdosfs/bpb.h b/include/freebsd/fs/msdosfs/bpb.h
similarity index 100%
rename from include_bsd/fs/msdosfs/bpb.h
rename to include/freebsd/fs/msdosfs/bpb.h
diff --git a/include_bsd/fs/msdosfs/denode.h b/include/freebsd/fs/msdosfs/denode.h
similarity index 100%
rename from include_bsd/fs/msdosfs/denode.h
rename to include/freebsd/fs/msdosfs/denode.h
diff --git a/include_bsd/fs/msdosfs/direntry.h b/include/freebsd/fs/msdosfs/direntry.h
similarity index 100%
rename from include_bsd/fs/msdosfs/direntry.h
rename to include/freebsd/fs/msdosfs/direntry.h
diff --git a/include_bsd/fs/msdosfs/fat.h b/include/freebsd/fs/msdosfs/fat.h
similarity index 100%
rename from include_bsd/fs/msdosfs/fat.h
rename to include/freebsd/fs/msdosfs/fat.h
diff --git a/include_bsd/fs/msdosfs/msdosfsmount.h b/include/freebsd/fs/msdosfs/msdosfsmount.h
similarity index 100%
rename from include_bsd/fs/msdosfs/msdosfsmount.h
rename to include/freebsd/fs/msdosfs/msdosfsmount.h
diff --git a/include_bsd/fs/nandfs/bmap.h b/include/freebsd/fs/nandfs/bmap.h
similarity index 100%
rename from include_bsd/fs/nandfs/bmap.h
rename to include/freebsd/fs/nandfs/bmap.h
diff --git a/include_bsd/fs/nandfs/nandfs.h b/include/freebsd/fs/nandfs/nandfs.h
similarity index 100%
rename from include_bsd/fs/nandfs/nandfs.h
rename to include/freebsd/fs/nandfs/nandfs.h
diff --git a/include_bsd/fs/nandfs/nandfs_fs.h b/include/freebsd/fs/nandfs/nandfs_fs.h
similarity index 100%
rename from include_bsd/fs/nandfs/nandfs_fs.h
rename to include/freebsd/fs/nandfs/nandfs_fs.h
diff --git a/include_bsd/fs/nandfs/nandfs_mount.h b/include/freebsd/fs/nandfs/nandfs_mount.h
similarity index 100%
rename from include_bsd/fs/nandfs/nandfs_mount.h
rename to include/freebsd/fs/nandfs/nandfs_mount.h
diff --git a/include_bsd/fs/nandfs/nandfs_subr.h b/include/freebsd/fs/nandfs/nandfs_subr.h
similarity index 100%
rename from include_bsd/fs/nandfs/nandfs_subr.h
rename to include/freebsd/fs/nandfs/nandfs_subr.h
diff --git a/include_bsd/fs/nfs/nfs.h b/include/freebsd/fs/nfs/nfs.h
similarity index 100%
rename from include_bsd/fs/nfs/nfs.h
rename to include/freebsd/fs/nfs/nfs.h
diff --git a/include_bsd/fs/nfs/nfs_var.h b/include/freebsd/fs/nfs/nfs_var.h
similarity index 100%
rename from include_bsd/fs/nfs/nfs_var.h
rename to include/freebsd/fs/nfs/nfs_var.h
diff --git a/include_bsd/fs/nfs/nfscl.h b/include/freebsd/fs/nfs/nfscl.h
similarity index 100%
rename from include_bsd/fs/nfs/nfscl.h
rename to include/freebsd/fs/nfs/nfscl.h
diff --git a/include_bsd/fs/nfs/nfsclstate.h b/include/freebsd/fs/nfs/nfsclstate.h
similarity index 100%
rename from include_bsd/fs/nfs/nfsclstate.h
rename to include/freebsd/fs/nfs/nfsclstate.h
diff --git a/include_bsd/fs/nfs/nfsdport.h b/include/freebsd/fs/nfs/nfsdport.h
similarity index 100%
rename from include_bsd/fs/nfs/nfsdport.h
rename to include/freebsd/fs/nfs/nfsdport.h
diff --git a/include_bsd/fs/nfs/nfskpiport.h b/include/freebsd/fs/nfs/nfskpiport.h
similarity index 100%
rename from include_bsd/fs/nfs/nfskpiport.h
rename to include/freebsd/fs/nfs/nfskpiport.h
diff --git a/include_bsd/fs/nfs/nfsm_subs.h b/include/freebsd/fs/nfs/nfsm_subs.h
similarity index 100%
rename from include_bsd/fs/nfs/nfsm_subs.h
rename to include/freebsd/fs/nfs/nfsm_subs.h
diff --git a/include_bsd/fs/nfs/nfsport.h b/include/freebsd/fs/nfs/nfsport.h
similarity index 100%
rename from include_bsd/fs/nfs/nfsport.h
rename to include/freebsd/fs/nfs/nfsport.h
diff --git a/include_bsd/fs/nfs/nfsproto.h b/include/freebsd/fs/nfs/nfsproto.h
similarity index 100%
rename from include_bsd/fs/nfs/nfsproto.h
rename to include/freebsd/fs/nfs/nfsproto.h
diff --git a/include_bsd/fs/nfs/nfsrvcache.h b/include/freebsd/fs/nfs/nfsrvcache.h
similarity index 100%
rename from include_bsd/fs/nfs/nfsrvcache.h
rename to include/freebsd/fs/nfs/nfsrvcache.h
diff --git a/include_bsd/fs/nfs/nfsrvstate.h b/include/freebsd/fs/nfs/nfsrvstate.h
similarity index 100%
rename from include_bsd/fs/nfs/nfsrvstate.h
rename to include/freebsd/fs/nfs/nfsrvstate.h
diff --git a/include_bsd/fs/nfs/nfsv4_errstr.h b/include/freebsd/fs/nfs/nfsv4_errstr.h
similarity index 100%
rename from include_bsd/fs/nfs/nfsv4_errstr.h
rename to include/freebsd/fs/nfs/nfsv4_errstr.h
diff --git a/include_bsd/fs/nfs/rpcv2.h b/include/freebsd/fs/nfs/rpcv2.h
similarity index 100%
rename from include_bsd/fs/nfs/rpcv2.h
rename to include/freebsd/fs/nfs/rpcv2.h
diff --git a/include_bsd/fs/nfs/xdr_subs.h b/include/freebsd/fs/nfs/xdr_subs.h
similarity index 100%
rename from include_bsd/fs/nfs/xdr_subs.h
rename to include/freebsd/fs/nfs/xdr_subs.h
diff --git a/include_bsd/fs/nullfs/null.h b/include/freebsd/fs/nullfs/null.h
similarity index 100%
rename from include_bsd/fs/nullfs/null.h
rename to include/freebsd/fs/nullfs/null.h
diff --git a/include_bsd/fs/procfs/procfs.h b/include/freebsd/fs/procfs/procfs.h
similarity index 100%
rename from include_bsd/fs/procfs/procfs.h
rename to include/freebsd/fs/procfs/procfs.h
diff --git a/include_bsd/fs/smbfs/smbfs.h b/include/freebsd/fs/smbfs/smbfs.h
similarity index 100%
rename from include_bsd/fs/smbfs/smbfs.h
rename to include/freebsd/fs/smbfs/smbfs.h
diff --git a/include_bsd/fs/smbfs/smbfs_node.h b/include/freebsd/fs/smbfs/smbfs_node.h
similarity index 100%
rename from include_bsd/fs/smbfs/smbfs_node.h
rename to include/freebsd/fs/smbfs/smbfs_node.h
diff --git a/include_bsd/fs/smbfs/smbfs_subr.h b/include/freebsd/fs/smbfs/smbfs_subr.h
similarity index 100%
rename from include_bsd/fs/smbfs/smbfs_subr.h
rename to include/freebsd/fs/smbfs/smbfs_subr.h
diff --git a/include_bsd/fs/udf/ecma167-udf.h b/include/freebsd/fs/udf/ecma167-udf.h
similarity index 100%
rename from include_bsd/fs/udf/ecma167-udf.h
rename to include/freebsd/fs/udf/ecma167-udf.h
diff --git a/include_bsd/fs/udf/osta.h b/include/freebsd/fs/udf/osta.h
similarity index 100%
rename from include_bsd/fs/udf/osta.h
rename to include/freebsd/fs/udf/osta.h
diff --git a/include_bsd/fs/udf/udf.h b/include/freebsd/fs/udf/udf.h
similarity index 100%
rename from include_bsd/fs/udf/udf.h
rename to include/freebsd/fs/udf/udf.h
diff --git a/include_bsd/fs/udf/udf_mount.h b/include/freebsd/fs/udf/udf_mount.h
similarity index 100%
rename from include_bsd/fs/udf/udf_mount.h
rename to include/freebsd/fs/udf/udf_mount.h
diff --git a/include_bsd/fs/unionfs/union.h b/include/freebsd/fs/unionfs/union.h
similarity index 100%
rename from include_bsd/fs/unionfs/union.h
rename to include/freebsd/fs/unionfs/union.h
diff --git a/include_bsd/fstab.h b/include/freebsd/fstab.h
similarity index 100%
rename from include_bsd/fstab.h
rename to include/freebsd/fstab.h
diff --git a/include_bsd/fts.h b/include/freebsd/fts.h
similarity index 100%
rename from include_bsd/fts.h
rename to include/freebsd/fts.h
diff --git a/include_bsd/ftw.h b/include/freebsd/ftw.h
similarity index 100%
rename from include_bsd/ftw.h
rename to include/freebsd/ftw.h
diff --git a/include_bsd/gelf.h b/include/freebsd/gelf.h
similarity index 100%
rename from include_bsd/gelf.h
rename to include/freebsd/gelf.h
diff --git a/include_bsd/geom/cache/g_cache.h b/include/freebsd/geom/cache/g_cache.h
similarity index 100%
rename from include_bsd/geom/cache/g_cache.h
rename to include/freebsd/geom/cache/g_cache.h
diff --git a/include_bsd/geom/concat/g_concat.h b/include/freebsd/geom/concat/g_concat.h
similarity index 100%
rename from include_bsd/geom/concat/g_concat.h
rename to include/freebsd/geom/concat/g_concat.h
diff --git a/include_bsd/geom/eli/g_eli.h b/include/freebsd/geom/eli/g_eli.h
similarity index 100%
rename from include_bsd/geom/eli/g_eli.h
rename to include/freebsd/geom/eli/g_eli.h
diff --git a/include_bsd/geom/eli/pkcs5v2.h b/include/freebsd/geom/eli/pkcs5v2.h
similarity index 100%
rename from include_bsd/geom/eli/pkcs5v2.h
rename to include/freebsd/geom/eli/pkcs5v2.h
diff --git a/include_bsd/geom/gate/g_gate.h b/include/freebsd/geom/gate/g_gate.h
similarity index 100%
rename from include_bsd/geom/gate/g_gate.h
rename to include/freebsd/geom/gate/g_gate.h
diff --git a/include_bsd/geom/geom.h b/include/freebsd/geom/geom.h
similarity index 100%
rename from include_bsd/geom/geom.h
rename to include/freebsd/geom/geom.h
diff --git a/include_bsd/geom/geom_ctl.h b/include/freebsd/geom/geom_ctl.h
similarity index 100%
rename from include_bsd/geom/geom_ctl.h
rename to include/freebsd/geom/geom_ctl.h
diff --git a/include_bsd/geom/geom_disk.h b/include/freebsd/geom/geom_disk.h
similarity index 100%
rename from include_bsd/geom/geom_disk.h
rename to include/freebsd/geom/geom_disk.h
diff --git a/include_bsd/geom/geom_int.h b/include/freebsd/geom/geom_int.h
similarity index 100%
rename from include_bsd/geom/geom_int.h
rename to include/freebsd/geom/geom_int.h
diff --git a/include_bsd/geom/geom_slice.h b/include/freebsd/geom/geom_slice.h
similarity index 100%
rename from include_bsd/geom/geom_slice.h
rename to include/freebsd/geom/geom_slice.h
diff --git a/include_bsd/geom/geom_vfs.h b/include/freebsd/geom/geom_vfs.h
similarity index 100%
rename from include_bsd/geom/geom_vfs.h
rename to include/freebsd/geom/geom_vfs.h
diff --git a/include_bsd/geom/journal/g_journal.h b/include/freebsd/geom/journal/g_journal.h
similarity index 100%
rename from include_bsd/geom/journal/g_journal.h
rename to include/freebsd/geom/journal/g_journal.h
diff --git a/include_bsd/geom/label/g_label.h b/include/freebsd/geom/label/g_label.h
similarity index 100%
rename from include_bsd/geom/label/g_label.h
rename to include/freebsd/geom/label/g_label.h
diff --git a/include_bsd/geom/label/g_label_msdosfs.h b/include/freebsd/geom/label/g_label_msdosfs.h
similarity index 100%
rename from include_bsd/geom/label/g_label_msdosfs.h
rename to include/freebsd/geom/label/g_label_msdosfs.h
diff --git a/include_bsd/geom/mirror/g_mirror.h b/include/freebsd/geom/mirror/g_mirror.h
similarity index 100%
rename from include_bsd/geom/mirror/g_mirror.h
rename to include/freebsd/geom/mirror/g_mirror.h
diff --git a/include_bsd/geom/mountver/g_mountver.h b/include/freebsd/geom/mountver/g_mountver.h
similarity index 100%
rename from include_bsd/geom/mountver/g_mountver.h
rename to include/freebsd/geom/mountver/g_mountver.h
diff --git a/include_bsd/geom/multipath/g_multipath.h b/include/freebsd/geom/multipath/g_multipath.h
similarity index 100%
rename from include_bsd/geom/multipath/g_multipath.h
rename to include/freebsd/geom/multipath/g_multipath.h
diff --git a/include_bsd/geom/nop/g_nop.h b/include/freebsd/geom/nop/g_nop.h
similarity index 100%
rename from include_bsd/geom/nop/g_nop.h
rename to include/freebsd/geom/nop/g_nop.h
diff --git a/include_bsd/geom/raid/g_raid.h b/include/freebsd/geom/raid/g_raid.h
similarity index 100%
rename from include_bsd/geom/raid/g_raid.h
rename to include/freebsd/geom/raid/g_raid.h
diff --git a/include_bsd/geom/raid/md_ddf.h b/include/freebsd/geom/raid/md_ddf.h
similarity index 100%
rename from include_bsd/geom/raid/md_ddf.h
rename to include/freebsd/geom/raid/md_ddf.h
diff --git a/include_bsd/geom/raid3/g_raid3.h b/include/freebsd/geom/raid3/g_raid3.h
similarity index 100%
rename from include_bsd/geom/raid3/g_raid3.h
rename to include/freebsd/geom/raid3/g_raid3.h
diff --git a/include_bsd/geom/shsec/g_shsec.h b/include/freebsd/geom/shsec/g_shsec.h
similarity index 100%
rename from include_bsd/geom/shsec/g_shsec.h
rename to include/freebsd/geom/shsec/g_shsec.h
diff --git a/include_bsd/geom/stripe/g_stripe.h b/include/freebsd/geom/stripe/g_stripe.h
similarity index 100%
rename from include_bsd/geom/stripe/g_stripe.h
rename to include/freebsd/geom/stripe/g_stripe.h
diff --git a/include_bsd/geom/virstor/binstream.h b/include/freebsd/geom/virstor/binstream.h
similarity index 100%
rename from include_bsd/geom/virstor/binstream.h
rename to include/freebsd/geom/virstor/binstream.h
diff --git a/include_bsd/geom/virstor/g_virstor.h b/include/freebsd/geom/virstor/g_virstor.h
similarity index 100%
rename from include_bsd/geom/virstor/g_virstor.h
rename to include/freebsd/geom/virstor/g_virstor.h
diff --git a/include_bsd/geom/virstor/g_virstor_md.h b/include/freebsd/geom/virstor/g_virstor_md.h
similarity index 100%
rename from include_bsd/geom/virstor/g_virstor_md.h
rename to include/freebsd/geom/virstor/g_virstor_md.h
diff --git a/include_bsd/getarg.h b/include/freebsd/getarg.h
similarity index 100%
rename from include_bsd/getarg.h
rename to include/freebsd/getarg.h
diff --git a/include_bsd/getopt.h b/include/freebsd/getopt.h
similarity index 100%
rename from include_bsd/getopt.h
rename to include/freebsd/getopt.h
diff --git a/include_bsd/glob.h b/include/freebsd/glob.h
similarity index 100%
rename from include_bsd/glob.h
rename to include/freebsd/glob.h
diff --git a/include_bsd/gnu/posix/regex.h b/include/freebsd/gnu/posix/regex.h
similarity index 100%
rename from include_bsd/gnu/posix/regex.h
rename to include/freebsd/gnu/posix/regex.h
diff --git a/include_bsd/gnu/regex.h b/include/freebsd/gnu/regex.h
similarity index 100%
rename from include_bsd/gnu/regex.h
rename to include/freebsd/gnu/regex.h
diff --git a/include_bsd/gnuregex.h b/include/freebsd/gnuregex.h
similarity index 100%
rename from include_bsd/gnuregex.h
rename to include/freebsd/gnuregex.h
diff --git a/include_bsd/grp.h b/include/freebsd/grp.h
similarity index 100%
rename from include_bsd/grp.h
rename to include/freebsd/grp.h
diff --git a/include_bsd/gssapi.h b/include/freebsd/gssapi.h
similarity index 100%
rename from include_bsd/gssapi.h
rename to include/freebsd/gssapi.h
diff --git a/include_bsd/gssapi/gssapi.h b/include/freebsd/gssapi/gssapi.h
similarity index 100%
rename from include_bsd/gssapi/gssapi.h
rename to include/freebsd/gssapi/gssapi.h
diff --git a/include_bsd/gssapi/gssapi_krb5.h b/include/freebsd/gssapi/gssapi_krb5.h
similarity index 100%
rename from include_bsd/gssapi/gssapi_krb5.h
rename to include/freebsd/gssapi/gssapi_krb5.h
diff --git a/include_bsd/hdb-protos.h b/include/freebsd/hdb-protos.h
similarity index 100%
rename from include_bsd/hdb-protos.h
rename to include/freebsd/hdb-protos.h
diff --git a/include_bsd/hdb.h b/include/freebsd/hdb.h
similarity index 100%
rename from include_bsd/hdb.h
rename to include/freebsd/hdb.h
diff --git a/include_bsd/hdb_asn1.h b/include/freebsd/hdb_asn1.h
similarity index 100%
rename from include_bsd/hdb_asn1.h
rename to include/freebsd/hdb_asn1.h
diff --git a/include_bsd/hdb_err.h b/include/freebsd/hdb_err.h
similarity index 100%
rename from include_bsd/hdb_err.h
rename to include/freebsd/hdb_err.h
diff --git a/include_bsd/heim_asn1.h b/include/freebsd/heim_asn1.h
similarity index 100%
rename from include_bsd/heim_asn1.h
rename to include/freebsd/heim_asn1.h
diff --git a/include_bsd/heim_err.h b/include/freebsd/heim_err.h
similarity index 100%
rename from include_bsd/heim_err.h
rename to include/freebsd/heim_err.h
diff --git a/include_bsd/heim_threads.h b/include/freebsd/heim_threads.h
similarity index 100%
rename from include_bsd/heim_threads.h
rename to include/freebsd/heim_threads.h
diff --git a/include_bsd/heimbase.h b/include/freebsd/heimbase.h
similarity index 100%
rename from include_bsd/heimbase.h
rename to include/freebsd/heimbase.h
diff --git a/include_bsd/heimntlm-protos.h b/include/freebsd/heimntlm-protos.h
similarity index 100%
rename from include_bsd/heimntlm-protos.h
rename to include/freebsd/heimntlm-protos.h
diff --git a/include_bsd/heimntlm.h b/include/freebsd/heimntlm.h
similarity index 100%
rename from include_bsd/heimntlm.h
rename to include/freebsd/heimntlm.h
diff --git a/include_bsd/hex.h b/include/freebsd/hex.h
similarity index 100%
rename from include_bsd/hex.h
rename to include/freebsd/hex.h
diff --git a/include_bsd/histedit.h b/include/freebsd/histedit.h
similarity index 100%
rename from include_bsd/histedit.h
rename to include/freebsd/histedit.h
diff --git a/include_bsd/hx509-private.h b/include/freebsd/hx509-private.h
similarity index 100%
rename from include_bsd/hx509-private.h
rename to include/freebsd/hx509-private.h
diff --git a/include_bsd/hx509-protos.h b/include/freebsd/hx509-protos.h
similarity index 100%
rename from include_bsd/hx509-protos.h
rename to include/freebsd/hx509-protos.h
diff --git a/include_bsd/hx509.h b/include/freebsd/hx509.h
similarity index 100%
rename from include_bsd/hx509.h
rename to include/freebsd/hx509.h
diff --git a/include_bsd/hx509_err.h b/include/freebsd/hx509_err.h
similarity index 100%
rename from include_bsd/hx509_err.h
rename to include/freebsd/hx509_err.h
diff --git a/include_bsd/iconv.h b/include/freebsd/iconv.h
similarity index 100%
rename from include_bsd/iconv.h
rename to include/freebsd/iconv.h
diff --git a/include_bsd/ieeefp.h b/include/freebsd/ieeefp.h
similarity index 100%
rename from include_bsd/ieeefp.h
rename to include/freebsd/ieeefp.h
diff --git a/include_bsd/ifaddrs.h b/include/freebsd/ifaddrs.h
similarity index 100%
rename from include_bsd/ifaddrs.h
rename to include/freebsd/ifaddrs.h
diff --git a/include_bsd/inttypes.h b/include/freebsd/inttypes.h
similarity index 100%
rename from include_bsd/inttypes.h
rename to include/freebsd/inttypes.h
diff --git a/include_bsd/iso646.h b/include/freebsd/iso646.h
similarity index 100%
rename from include_bsd/iso646.h
rename to include/freebsd/iso646.h
diff --git a/include_bsd/isofs/cd9660/cd9660_mount.h b/include/freebsd/isofs/cd9660/cd9660_mount.h
similarity index 100%
rename from include_bsd/isofs/cd9660/cd9660_mount.h
rename to include/freebsd/isofs/cd9660/cd9660_mount.h
diff --git a/include_bsd/isofs/cd9660/cd9660_node.h b/include/freebsd/isofs/cd9660/cd9660_node.h
similarity index 100%
rename from include_bsd/isofs/cd9660/cd9660_node.h
rename to include/freebsd/isofs/cd9660/cd9660_node.h
diff --git a/include_bsd/isofs/cd9660/cd9660_rrip.h b/include/freebsd/isofs/cd9660/cd9660_rrip.h
similarity index 100%
rename from include_bsd/isofs/cd9660/cd9660_rrip.h
rename to include/freebsd/isofs/cd9660/cd9660_rrip.h
diff --git a/include_bsd/isofs/cd9660/iso.h b/include/freebsd/isofs/cd9660/iso.h
similarity index 100%
rename from include_bsd/isofs/cd9660/iso.h
rename to include/freebsd/isofs/cd9660/iso.h
diff --git a/include_bsd/isofs/cd9660/iso_rrip.h b/include/freebsd/isofs/cd9660/iso_rrip.h
similarity index 100%
rename from include_bsd/isofs/cd9660/iso_rrip.h
rename to include/freebsd/isofs/cd9660/iso_rrip.h
diff --git a/include_bsd/jail.h b/include/freebsd/jail.h
similarity index 100%
rename from include_bsd/jail.h
rename to include/freebsd/jail.h
diff --git a/include_bsd/k524_err.h b/include/freebsd/k524_err.h
similarity index 100%
rename from include_bsd/k524_err.h
rename to include/freebsd/k524_err.h
diff --git a/include_bsd/kadm5/admin.h b/include/freebsd/kadm5/admin.h
similarity index 100%
rename from include_bsd/kadm5/admin.h
rename to include/freebsd/kadm5/admin.h
diff --git a/include_bsd/kadm5/kadm5-private.h b/include/freebsd/kadm5/kadm5-private.h
similarity index 100%
rename from include_bsd/kadm5/kadm5-private.h
rename to include/freebsd/kadm5/kadm5-private.h
diff --git a/include_bsd/kadm5/kadm5-protos.h b/include/freebsd/kadm5/kadm5-protos.h
similarity index 100%
rename from include_bsd/kadm5/kadm5-protos.h
rename to include/freebsd/kadm5/kadm5-protos.h
diff --git a/include_bsd/kadm5/kadm5-pwcheck.h b/include/freebsd/kadm5/kadm5-pwcheck.h
similarity index 100%
rename from include_bsd/kadm5/kadm5-pwcheck.h
rename to include/freebsd/kadm5/kadm5-pwcheck.h
diff --git a/include_bsd/kadm5/kadm5_err.h b/include/freebsd/kadm5/kadm5_err.h
similarity index 100%
rename from include_bsd/kadm5/kadm5_err.h
rename to include/freebsd/kadm5/kadm5_err.h
diff --git a/include_bsd/kadm5/private.h b/include/freebsd/kadm5/private.h
similarity index 100%
rename from include_bsd/kadm5/private.h
rename to include/freebsd/kadm5/private.h
diff --git a/include_bsd/kafs.h b/include/freebsd/kafs.h
similarity index 100%
rename from include_bsd/kafs.h
rename to include/freebsd/kafs.h
diff --git a/include_bsd/kdc-protos.h b/include/freebsd/kdc-protos.h
similarity index 100%
rename from include_bsd/kdc-protos.h
rename to include/freebsd/kdc-protos.h
diff --git a/include_bsd/kdc.h b/include/freebsd/kdc.h
similarity index 100%
rename from include_bsd/kdc.h
rename to include/freebsd/kdc.h
diff --git a/include_bsd/kenv.h b/include/freebsd/kenv.h
similarity index 100%
rename from include_bsd/kenv.h
rename to include/freebsd/kenv.h
diff --git a/include_bsd/krb5-private.h b/include/freebsd/krb5-private.h
similarity index 100%
rename from include_bsd/krb5-private.h
rename to include/freebsd/krb5-private.h
diff --git a/include_bsd/krb5-protos.h b/include/freebsd/krb5-protos.h
similarity index 100%
rename from include_bsd/krb5-protos.h
rename to include/freebsd/krb5-protos.h
diff --git a/include_bsd/krb5-types.h b/include/freebsd/krb5-types.h
similarity index 100%
rename from include_bsd/krb5-types.h
rename to include/freebsd/krb5-types.h
diff --git a/include_bsd/krb5.h b/include/freebsd/krb5.h
similarity index 100%
rename from include_bsd/krb5.h
rename to include/freebsd/krb5.h
diff --git a/include_bsd/krb5/ccache_plugin.h b/include/freebsd/krb5/ccache_plugin.h
similarity index 100%
rename from include_bsd/krb5/ccache_plugin.h
rename to include/freebsd/krb5/ccache_plugin.h
diff --git a/include_bsd/krb5/locate_plugin.h b/include/freebsd/krb5/locate_plugin.h
similarity index 100%
rename from include_bsd/krb5/locate_plugin.h
rename to include/freebsd/krb5/locate_plugin.h
diff --git a/include_bsd/krb5/send_to_kdc_plugin.h b/include/freebsd/krb5/send_to_kdc_plugin.h
similarity index 100%
rename from include_bsd/krb5/send_to_kdc_plugin.h
rename to include/freebsd/krb5/send_to_kdc_plugin.h
diff --git a/include_bsd/krb5/windc_plugin.h b/include/freebsd/krb5/windc_plugin.h
similarity index 100%
rename from include_bsd/krb5/windc_plugin.h
rename to include/freebsd/krb5/windc_plugin.h
diff --git a/include_bsd/krb5_asn1.h b/include/freebsd/krb5_asn1.h
similarity index 100%
rename from include_bsd/krb5_asn1.h
rename to include/freebsd/krb5_asn1.h
diff --git a/include_bsd/krb5_ccapi.h b/include/freebsd/krb5_ccapi.h
similarity index 100%
rename from include_bsd/krb5_ccapi.h
rename to include/freebsd/krb5_ccapi.h
diff --git a/include_bsd/krb5_err.h b/include/freebsd/krb5_err.h
similarity index 100%
rename from include_bsd/krb5_err.h
rename to include/freebsd/krb5_err.h
diff --git a/include_bsd/kvm.h b/include/freebsd/kvm.h
similarity index 100%
rename from include_bsd/kvm.h
rename to include/freebsd/kvm.h
diff --git a/include_bsd/kx509_asn1.h b/include/freebsd/kx509_asn1.h
similarity index 100%
rename from include_bsd/kx509_asn1.h
rename to include/freebsd/kx509_asn1.h
diff --git a/include_bsd/langinfo.h b/include/freebsd/langinfo.h
similarity index 100%
rename from include_bsd/langinfo.h
rename to include/freebsd/langinfo.h
diff --git a/include_bsd/lib80211/lib80211_ioctl.h b/include/freebsd/lib80211/lib80211_ioctl.h
similarity index 100%
rename from include_bsd/lib80211/lib80211_ioctl.h
rename to include/freebsd/lib80211/lib80211_ioctl.h
diff --git a/include_bsd/lib80211/lib80211_regdomain.h b/include/freebsd/lib80211/lib80211_regdomain.h
similarity index 100%
rename from include_bsd/lib80211/lib80211_regdomain.h
rename to include/freebsd/lib80211/lib80211_regdomain.h
diff --git a/include_bsd/libcasper.h b/include/freebsd/libcasper.h
similarity index 100%
rename from include_bsd/libcasper.h
rename to include/freebsd/libcasper.h
diff --git a/include_bsd/libcasper_service.h b/include/freebsd/libcasper_service.h
similarity index 100%
rename from include_bsd/libcasper_service.h
rename to include/freebsd/libcasper_service.h
diff --git a/include_bsd/libdwarf.h b/include/freebsd/libdwarf.h
similarity index 100%
rename from include_bsd/libdwarf.h
rename to include/freebsd/libdwarf.h
diff --git a/include_bsd/libelf.h b/include/freebsd/libelf.h
similarity index 100%
rename from include_bsd/libelf.h
rename to include/freebsd/libelf.h
diff --git a/include_bsd/libelftc.h b/include/freebsd/libelftc.h
similarity index 100%
rename from include_bsd/libelftc.h
rename to include/freebsd/libelftc.h
diff --git a/include_bsd/libgen.h b/include/freebsd/libgen.h
similarity index 100%
rename from include_bsd/libgen.h
rename to include/freebsd/libgen.h
diff --git a/include_bsd/libgeom.h b/include/freebsd/libgeom.h
similarity index 100%
rename from include_bsd/libgeom.h
rename to include/freebsd/libgeom.h
diff --git a/include_bsd/libgpio.h b/include/freebsd/libgpio.h
similarity index 100%
rename from include_bsd/libgpio.h
rename to include/freebsd/libgpio.h
diff --git a/include_bsd/libmilter/mfapi.h b/include/freebsd/libmilter/mfapi.h
similarity index 100%
rename from include_bsd/libmilter/mfapi.h
rename to include/freebsd/libmilter/mfapi.h
diff --git a/include_bsd/libmilter/mfdef.h b/include/freebsd/libmilter/mfdef.h
similarity index 100%
rename from include_bsd/libmilter/mfdef.h
rename to include/freebsd/libmilter/mfdef.h
diff --git a/include_bsd/libproc.h b/include/freebsd/libproc.h
similarity index 100%
rename from include_bsd/libproc.h
rename to include/freebsd/libproc.h
diff --git a/include_bsd/libprocstat.h b/include/freebsd/libprocstat.h
similarity index 100%
rename from include_bsd/libprocstat.h
rename to include/freebsd/libprocstat.h
diff --git a/include_bsd/libufs.h b/include/freebsd/libufs.h
similarity index 100%
rename from include_bsd/libufs.h
rename to include/freebsd/libufs.h
diff --git a/include_bsd/libusb.h b/include/freebsd/libusb.h
similarity index 100%
rename from include_bsd/libusb.h
rename to include/freebsd/libusb.h
diff --git a/include_bsd/libusb20.h b/include/freebsd/libusb20.h
similarity index 100%
rename from include_bsd/libusb20.h
rename to include/freebsd/libusb20.h
diff --git a/include_bsd/libusb20_desc.h b/include/freebsd/libusb20_desc.h
similarity index 100%
rename from include_bsd/libusb20_desc.h
rename to include/freebsd/libusb20_desc.h
diff --git a/include_bsd/libutil.h b/include/freebsd/libutil.h
similarity index 100%
rename from include_bsd/libutil.h
rename to include/freebsd/libutil.h
diff --git a/include_bsd/libxo/xo.h b/include/freebsd/libxo/xo.h
similarity index 100%
rename from include_bsd/libxo/xo.h
rename to include/freebsd/libxo/xo.h
diff --git a/include_bsd/libxo/xo_encoder.h b/include/freebsd/libxo/xo_encoder.h
similarity index 100%
rename from include_bsd/libxo/xo_encoder.h
rename to include/freebsd/libxo/xo_encoder.h
diff --git a/include_bsd/limits.h b/include/freebsd/limits.h
similarity index 100%
rename from include_bsd/limits.h
rename to include/freebsd/limits.h
diff --git a/include_bsd/link.h b/include/freebsd/link.h
similarity index 100%
rename from include_bsd/link.h
rename to include/freebsd/link.h
diff --git a/include_bsd/linker_set.h b/include/freebsd/linker_set.h
similarity index 100%
rename from include_bsd/linker_set.h
rename to include/freebsd/linker_set.h
diff --git a/include_bsd/locale.h b/include/freebsd/locale.h
similarity index 100%
rename from include_bsd/locale.h
rename to include/freebsd/locale.h
diff --git a/include_bsd/login_cap.h b/include/freebsd/login_cap.h
similarity index 100%
rename from include_bsd/login_cap.h
rename to include/freebsd/login_cap.h
diff --git a/include_bsd/lzma.h b/include/freebsd/lzma.h
similarity index 100%
rename from include_bsd/lzma.h
rename to include/freebsd/lzma.h
diff --git a/include_bsd/lzma/base.h b/include/freebsd/lzma/base.h
similarity index 100%
rename from include_bsd/lzma/base.h
rename to include/freebsd/lzma/base.h
diff --git a/include_bsd/lzma/bcj.h b/include/freebsd/lzma/bcj.h
similarity index 100%
rename from include_bsd/lzma/bcj.h
rename to include/freebsd/lzma/bcj.h
diff --git a/include_bsd/lzma/block.h b/include/freebsd/lzma/block.h
similarity index 100%
rename from include_bsd/lzma/block.h
rename to include/freebsd/lzma/block.h
diff --git a/include_bsd/lzma/check.h b/include/freebsd/lzma/check.h
similarity index 100%
rename from include_bsd/lzma/check.h
rename to include/freebsd/lzma/check.h
diff --git a/include_bsd/lzma/container.h b/include/freebsd/lzma/container.h
similarity index 100%
rename from include_bsd/lzma/container.h
rename to include/freebsd/lzma/container.h
diff --git a/include_bsd/lzma/delta.h b/include/freebsd/lzma/delta.h
similarity index 100%
rename from include_bsd/lzma/delta.h
rename to include/freebsd/lzma/delta.h
diff --git a/include_bsd/lzma/filter.h b/include/freebsd/lzma/filter.h
similarity index 100%
rename from include_bsd/lzma/filter.h
rename to include/freebsd/lzma/filter.h
diff --git a/include_bsd/lzma/hardware.h b/include/freebsd/lzma/hardware.h
similarity index 100%
rename from include_bsd/lzma/hardware.h
rename to include/freebsd/lzma/hardware.h
diff --git a/include_bsd/lzma/index.h b/include/freebsd/lzma/index.h
similarity index 100%
rename from include_bsd/lzma/index.h
rename to include/freebsd/lzma/index.h
diff --git a/include_bsd/lzma/index_hash.h b/include/freebsd/lzma/index_hash.h
similarity index 100%
rename from include_bsd/lzma/index_hash.h
rename to include/freebsd/lzma/index_hash.h
diff --git a/include_bsd/lzma/lzma12.h b/include/freebsd/lzma/lzma12.h
similarity index 100%
rename from include_bsd/lzma/lzma12.h
rename to include/freebsd/lzma/lzma12.h
diff --git a/include_bsd/lzma/stream_flags.h b/include/freebsd/lzma/stream_flags.h
similarity index 100%
rename from include_bsd/lzma/stream_flags.h
rename to include/freebsd/lzma/stream_flags.h
diff --git a/include_bsd/lzma/version.h b/include/freebsd/lzma/version.h
similarity index 100%
rename from include_bsd/lzma/version.h
rename to include/freebsd/lzma/version.h
diff --git a/include_bsd/lzma/vli.h b/include/freebsd/lzma/vli.h
similarity index 100%
rename from include_bsd/lzma/vli.h
rename to include/freebsd/lzma/vli.h
diff --git a/include_bsd/machine/_align.h b/include/freebsd/machine/_align.h
similarity index 100%
rename from include_bsd/machine/_align.h
rename to include/freebsd/machine/_align.h
diff --git a/include_bsd/machine/_bus.h b/include/freebsd/machine/_bus.h
similarity index 100%
rename from include_bsd/machine/_bus.h
rename to include/freebsd/machine/_bus.h
diff --git a/include_bsd/machine/_inttypes.h b/include/freebsd/machine/_inttypes.h
similarity index 100%
rename from include_bsd/machine/_inttypes.h
rename to include/freebsd/machine/_inttypes.h
diff --git a/include_bsd/machine/_limits.h b/include/freebsd/machine/_limits.h
similarity index 100%
rename from include_bsd/machine/_limits.h
rename to include/freebsd/machine/_limits.h
diff --git a/include_bsd/machine/_stdint.h b/include/freebsd/machine/_stdint.h
similarity index 100%
rename from include_bsd/machine/_stdint.h
rename to include/freebsd/machine/_stdint.h
diff --git a/include_bsd/machine/_types.h b/include/freebsd/machine/_types.h
similarity index 100%
rename from include_bsd/machine/_types.h
rename to include/freebsd/machine/_types.h
diff --git a/include_bsd/machine/acpica_machdep.h b/include/freebsd/machine/acpica_machdep.h
similarity index 100%
rename from include_bsd/machine/acpica_machdep.h
rename to include/freebsd/machine/acpica_machdep.h
diff --git a/include_bsd/machine/apm_bios.h b/include/freebsd/machine/apm_bios.h
similarity index 100%
rename from include_bsd/machine/apm_bios.h
rename to include/freebsd/machine/apm_bios.h
diff --git a/include_bsd/machine/asm.h b/include/freebsd/machine/asm.h
similarity index 100%
rename from include_bsd/machine/asm.h
rename to include/freebsd/machine/asm.h
diff --git a/include_bsd/machine/asmacros.h b/include/freebsd/machine/asmacros.h
similarity index 100%
rename from include_bsd/machine/asmacros.h
rename to include/freebsd/machine/asmacros.h
diff --git a/include_bsd/machine/atomic.h b/include/freebsd/machine/atomic.h
similarity index 100%
rename from include_bsd/machine/atomic.h
rename to include/freebsd/machine/atomic.h
diff --git a/include_bsd/machine/bus.h b/include/freebsd/machine/bus.h
similarity index 100%
rename from include_bsd/machine/bus.h
rename to include/freebsd/machine/bus.h
diff --git a/include_bsd/machine/bus_dma.h b/include/freebsd/machine/bus_dma.h
similarity index 100%
rename from include_bsd/machine/bus_dma.h
rename to include/freebsd/machine/bus_dma.h
diff --git a/include_bsd/machine/clock.h b/include/freebsd/machine/clock.h
similarity index 100%
rename from include_bsd/machine/clock.h
rename to include/freebsd/machine/clock.h
diff --git a/include_bsd/machine/counter.h b/include/freebsd/machine/counter.h
similarity index 100%
rename from include_bsd/machine/counter.h
rename to include/freebsd/machine/counter.h
diff --git a/include_bsd/machine/cpu.h b/include/freebsd/machine/cpu.h
similarity index 100%
rename from include_bsd/machine/cpu.h
rename to include/freebsd/machine/cpu.h
diff --git a/include_bsd/machine/cpufunc.h b/include/freebsd/machine/cpufunc.h
similarity index 100%
rename from include_bsd/machine/cpufunc.h
rename to include/freebsd/machine/cpufunc.h
diff --git a/include_bsd/machine/cputypes.h b/include/freebsd/machine/cputypes.h
similarity index 100%
rename from include_bsd/machine/cputypes.h
rename to include/freebsd/machine/cputypes.h
diff --git a/include_bsd/machine/db_machdep.h b/include/freebsd/machine/db_machdep.h
similarity index 100%
rename from include_bsd/machine/db_machdep.h
rename to include/freebsd/machine/db_machdep.h
diff --git a/include_bsd/machine/dump.h b/include/freebsd/machine/dump.h
similarity index 100%
rename from include_bsd/machine/dump.h
rename to include/freebsd/machine/dump.h
diff --git a/include_bsd/machine/elf.h b/include/freebsd/machine/elf.h
similarity index 100%
rename from include_bsd/machine/elf.h
rename to include/freebsd/machine/elf.h
diff --git a/include_bsd/machine/endian.h b/include/freebsd/machine/endian.h
similarity index 100%
rename from include_bsd/machine/endian.h
rename to include/freebsd/machine/endian.h
diff --git a/include_bsd/machine/exec.h b/include/freebsd/machine/exec.h
similarity index 100%
rename from include_bsd/machine/exec.h
rename to include/freebsd/machine/exec.h
diff --git a/include_bsd/machine/fdt.h b/include/freebsd/machine/fdt.h
similarity index 100%
rename from include_bsd/machine/fdt.h
rename to include/freebsd/machine/fdt.h
diff --git a/include_bsd/machine/float.h b/include/freebsd/machine/float.h
similarity index 100%
rename from include_bsd/machine/float.h
rename to include/freebsd/machine/float.h
diff --git a/include_bsd/machine/floatingpoint.h b/include/freebsd/machine/floatingpoint.h
similarity index 100%
rename from include_bsd/machine/floatingpoint.h
rename to include/freebsd/machine/floatingpoint.h
diff --git a/include_bsd/machine/fpu.h b/include/freebsd/machine/fpu.h
similarity index 100%
rename from include_bsd/machine/fpu.h
rename to include/freebsd/machine/fpu.h
diff --git a/include_bsd/machine/frame.h b/include/freebsd/machine/frame.h
similarity index 100%
rename from include_bsd/machine/frame.h
rename to include/freebsd/machine/frame.h
diff --git a/include_bsd/machine/gdb_machdep.h b/include/freebsd/machine/gdb_machdep.h
similarity index 100%
rename from include_bsd/machine/gdb_machdep.h
rename to include/freebsd/machine/gdb_machdep.h
diff --git a/include_bsd/machine/ieeefp.h b/include/freebsd/machine/ieeefp.h
similarity index 100%
rename from include_bsd/machine/ieeefp.h
rename to include/freebsd/machine/ieeefp.h
diff --git a/include_bsd/machine/in_cksum.h b/include/freebsd/machine/in_cksum.h
similarity index 100%
rename from include_bsd/machine/in_cksum.h
rename to include/freebsd/machine/in_cksum.h
diff --git a/include_bsd/machine/intr_machdep.h b/include/freebsd/machine/intr_machdep.h
similarity index 100%
rename from include_bsd/machine/intr_machdep.h
rename to include/freebsd/machine/intr_machdep.h
diff --git a/include_bsd/machine/iodev.h b/include/freebsd/machine/iodev.h
similarity index 100%
rename from include_bsd/machine/iodev.h
rename to include/freebsd/machine/iodev.h
diff --git a/include_bsd/machine/kdb.h b/include/freebsd/machine/kdb.h
similarity index 100%
rename from include_bsd/machine/kdb.h
rename to include/freebsd/machine/kdb.h
diff --git a/include_bsd/machine/limits.h b/include/freebsd/machine/limits.h
similarity index 100%
rename from include_bsd/machine/limits.h
rename to include/freebsd/machine/limits.h
diff --git a/include_bsd/machine/md_var.h b/include/freebsd/machine/md_var.h
similarity index 100%
rename from include_bsd/machine/md_var.h
rename to include/freebsd/machine/md_var.h
diff --git a/include_bsd/machine/memdev.h b/include/freebsd/machine/memdev.h
similarity index 100%
rename from include_bsd/machine/memdev.h
rename to include/freebsd/machine/memdev.h
diff --git a/include_bsd/machine/metadata.h b/include/freebsd/machine/metadata.h
similarity index 100%
rename from include_bsd/machine/metadata.h
rename to include/freebsd/machine/metadata.h
diff --git a/include_bsd/machine/minidump.h b/include/freebsd/machine/minidump.h
similarity index 100%
rename from include_bsd/machine/minidump.h
rename to include/freebsd/machine/minidump.h
diff --git a/include_bsd/machine/mp_watchdog.h b/include/freebsd/machine/mp_watchdog.h
similarity index 100%
rename from include_bsd/machine/mp_watchdog.h
rename to include/freebsd/machine/mp_watchdog.h
diff --git a/include_bsd/machine/nexusvar.h b/include/freebsd/machine/nexusvar.h
similarity index 100%
rename from include_bsd/machine/nexusvar.h
rename to include/freebsd/machine/nexusvar.h
diff --git a/include_bsd/machine/npx.h b/include/freebsd/machine/npx.h
similarity index 100%
rename from include_bsd/machine/npx.h
rename to include/freebsd/machine/npx.h
diff --git a/include_bsd/machine/ofw_machdep.h b/include/freebsd/machine/ofw_machdep.h
similarity index 100%
rename from include_bsd/machine/ofw_machdep.h
rename to include/freebsd/machine/ofw_machdep.h
diff --git a/include_bsd/machine/param.h b/include/freebsd/machine/param.h
similarity index 100%
rename from include_bsd/machine/param.h
rename to include/freebsd/machine/param.h
diff --git a/include_bsd/machine/pc/bios.h b/include/freebsd/machine/pc/bios.h
similarity index 100%
rename from include_bsd/machine/pc/bios.h
rename to include/freebsd/machine/pc/bios.h
diff --git a/include_bsd/machine/pc/display.h b/include/freebsd/machine/pc/display.h
similarity index 100%
rename from include_bsd/machine/pc/display.h
rename to include/freebsd/machine/pc/display.h
diff --git a/include_bsd/machine/pcb.h b/include/freebsd/machine/pcb.h
similarity index 100%
rename from include_bsd/machine/pcb.h
rename to include/freebsd/machine/pcb.h
diff --git a/include_bsd/machine/pci_cfgreg.h b/include/freebsd/machine/pci_cfgreg.h
similarity index 100%
rename from include_bsd/machine/pci_cfgreg.h
rename to include/freebsd/machine/pci_cfgreg.h
diff --git a/include_bsd/machine/pcpu.h b/include/freebsd/machine/pcpu.h
similarity index 100%
rename from include_bsd/machine/pcpu.h
rename to include/freebsd/machine/pcpu.h
diff --git a/include_bsd/machine/pmap.h b/include/freebsd/machine/pmap.h
similarity index 100%
rename from include_bsd/machine/pmap.h
rename to include/freebsd/machine/pmap.h
diff --git a/include_bsd/machine/pmc_mdep.h b/include/freebsd/machine/pmc_mdep.h
similarity index 100%
rename from include_bsd/machine/pmc_mdep.h
rename to include/freebsd/machine/pmc_mdep.h
diff --git a/include_bsd/machine/ppireg.h b/include/freebsd/machine/ppireg.h
similarity index 100%
rename from include_bsd/machine/ppireg.h
rename to include/freebsd/machine/ppireg.h
diff --git a/include_bsd/machine/proc.h b/include/freebsd/machine/proc.h
similarity index 100%
rename from include_bsd/machine/proc.h
rename to include/freebsd/machine/proc.h
diff --git a/include_bsd/machine/profile.h b/include/freebsd/machine/profile.h
similarity index 100%
rename from include_bsd/machine/profile.h
rename to include/freebsd/machine/profile.h
diff --git a/include_bsd/machine/psl.h b/include/freebsd/machine/psl.h
similarity index 100%
rename from include_bsd/machine/psl.h
rename to include/freebsd/machine/psl.h
diff --git a/include_bsd/machine/ptrace.h b/include/freebsd/machine/ptrace.h
similarity index 100%
rename from include_bsd/machine/ptrace.h
rename to include/freebsd/machine/ptrace.h
diff --git a/include_bsd/machine/pvclock.h b/include/freebsd/machine/pvclock.h
similarity index 100%
rename from include_bsd/machine/pvclock.h
rename to include/freebsd/machine/pvclock.h
diff --git a/include_bsd/machine/reg.h b/include/freebsd/machine/reg.h
similarity index 100%
rename from include_bsd/machine/reg.h
rename to include/freebsd/machine/reg.h
diff --git a/include_bsd/machine/reloc.h b/include/freebsd/machine/reloc.h
similarity index 100%
rename from include_bsd/machine/reloc.h
rename to include/freebsd/machine/reloc.h
diff --git a/include_bsd/machine/resource.h b/include/freebsd/machine/resource.h
similarity index 100%
rename from include_bsd/machine/resource.h
rename to include/freebsd/machine/resource.h
diff --git a/include_bsd/machine/runq.h b/include/freebsd/machine/runq.h
similarity index 100%
rename from include_bsd/machine/runq.h
rename to include/freebsd/machine/runq.h
diff --git a/include_bsd/machine/segments.h b/include/freebsd/machine/segments.h
similarity index 100%
rename from include_bsd/machine/segments.h
rename to include/freebsd/machine/segments.h
diff --git a/include_bsd/machine/setjmp.h b/include/freebsd/machine/setjmp.h
similarity index 100%
rename from include_bsd/machine/setjmp.h
rename to include/freebsd/machine/setjmp.h
diff --git a/include_bsd/machine/sf_buf.h b/include/freebsd/machine/sf_buf.h
similarity index 100%
rename from include_bsd/machine/sf_buf.h
rename to include/freebsd/machine/sf_buf.h
diff --git a/include_bsd/machine/sigframe.h b/include/freebsd/machine/sigframe.h
similarity index 100%
rename from include_bsd/machine/sigframe.h
rename to include/freebsd/machine/sigframe.h
diff --git a/include_bsd/machine/signal.h b/include/freebsd/machine/signal.h
similarity index 100%
rename from include_bsd/machine/signal.h
rename to include/freebsd/machine/signal.h
diff --git a/include_bsd/machine/smp.h b/include/freebsd/machine/smp.h
similarity index 100%
rename from include_bsd/machine/smp.h
rename to include/freebsd/machine/smp.h
diff --git a/include_bsd/machine/specialreg.h b/include/freebsd/machine/specialreg.h
similarity index 100%
rename from include_bsd/machine/specialreg.h
rename to include/freebsd/machine/specialreg.h
diff --git a/include_bsd/machine/stack.h b/include/freebsd/machine/stack.h
similarity index 100%
rename from include_bsd/machine/stack.h
rename to include/freebsd/machine/stack.h
diff --git a/include_bsd/machine/stdarg.h b/include/freebsd/machine/stdarg.h
similarity index 100%
rename from include_bsd/machine/stdarg.h
rename to include/freebsd/machine/stdarg.h
diff --git a/include_bsd/machine/sysarch.h b/include/freebsd/machine/sysarch.h
similarity index 100%
rename from include_bsd/machine/sysarch.h
rename to include/freebsd/machine/sysarch.h
diff --git a/include_bsd/machine/timerreg.h b/include/freebsd/machine/timerreg.h
similarity index 100%
rename from include_bsd/machine/timerreg.h
rename to include/freebsd/machine/timerreg.h
diff --git a/include_bsd/machine/trap.h b/include/freebsd/machine/trap.h
similarity index 100%
rename from include_bsd/machine/trap.h
rename to include/freebsd/machine/trap.h
diff --git a/include_bsd/machine/tss.h b/include/freebsd/machine/tss.h
similarity index 100%
rename from include_bsd/machine/tss.h
rename to include/freebsd/machine/tss.h
diff --git a/include_bsd/machine/ucontext.h b/include/freebsd/machine/ucontext.h
similarity index 100%
rename from include_bsd/machine/ucontext.h
rename to include/freebsd/machine/ucontext.h
diff --git a/include_bsd/machine/varargs.h b/include/freebsd/machine/varargs.h
similarity index 100%
rename from include_bsd/machine/varargs.h
rename to include/freebsd/machine/varargs.h
diff --git a/include_bsd/machine/vdso.h b/include/freebsd/machine/vdso.h
similarity index 100%
rename from include_bsd/machine/vdso.h
rename to include/freebsd/machine/vdso.h
diff --git a/include_bsd/machine/vm.h b/include/freebsd/machine/vm.h
similarity index 100%
rename from include_bsd/machine/vm.h
rename to include/freebsd/machine/vm.h
diff --git a/include_bsd/machine/vmm.h b/include/freebsd/machine/vmm.h
similarity index 100%
rename from include_bsd/machine/vmm.h
rename to include/freebsd/machine/vmm.h
diff --git a/include_bsd/machine/vmm_dev.h b/include/freebsd/machine/vmm_dev.h
similarity index 100%
rename from include_bsd/machine/vmm_dev.h
rename to include/freebsd/machine/vmm_dev.h
diff --git a/include_bsd/machine/vmm_instruction_emul.h b/include/freebsd/machine/vmm_instruction_emul.h
similarity index 100%
rename from include_bsd/machine/vmm_instruction_emul.h
rename to include/freebsd/machine/vmm_instruction_emul.h
diff --git a/include_bsd/machine/vmparam.h b/include/freebsd/machine/vmparam.h
similarity index 100%
rename from include_bsd/machine/vmparam.h
rename to include/freebsd/machine/vmparam.h
diff --git a/include_bsd/magic.h b/include/freebsd/magic.h
similarity index 100%
rename from include_bsd/magic.h
rename to include/freebsd/magic.h
diff --git a/include_bsd/malloc.h b/include/freebsd/malloc.h
similarity index 100%
rename from include_bsd/malloc.h
rename to include/freebsd/malloc.h
diff --git a/include_bsd/malloc_np.h b/include/freebsd/malloc_np.h
similarity index 100%
rename from include_bsd/malloc_np.h
rename to include/freebsd/malloc_np.h
diff --git a/include_bsd/math.h b/include/freebsd/math.h
similarity index 100%
rename from include_bsd/math.h
rename to include/freebsd/math.h
diff --git a/include_bsd/md4.h b/include/freebsd/md4.h
similarity index 100%
rename from include_bsd/md4.h
rename to include/freebsd/md4.h
diff --git a/include_bsd/md5.h b/include/freebsd/md5.h
similarity index 100%
rename from include_bsd/md5.h
rename to include/freebsd/md5.h
diff --git a/include_bsd/memory.h b/include/freebsd/memory.h
similarity index 100%
rename from include_bsd/memory.h
rename to include/freebsd/memory.h
diff --git a/include_bsd/memstat.h b/include/freebsd/memstat.h
similarity index 100%
rename from include_bsd/memstat.h
rename to include/freebsd/memstat.h
diff --git a/include_bsd/menu.h b/include/freebsd/menu.h
similarity index 100%
rename from include_bsd/menu.h
rename to include/freebsd/menu.h
diff --git a/include_bsd/monetary.h b/include/freebsd/monetary.h
similarity index 100%
rename from include_bsd/monetary.h
rename to include/freebsd/monetary.h
diff --git a/include_bsd/mp.h b/include/freebsd/mp.h
similarity index 100%
rename from include_bsd/mp.h
rename to include/freebsd/mp.h
diff --git a/include_bsd/mpool.h b/include/freebsd/mpool.h
similarity index 100%
rename from include_bsd/mpool.h
rename to include/freebsd/mpool.h
diff --git a/include_bsd/mqueue.h b/include/freebsd/mqueue.h
similarity index 100%
rename from include_bsd/mqueue.h
rename to include/freebsd/mqueue.h
diff --git a/include_bsd/mtlib.h b/include/freebsd/mtlib.h
similarity index 100%
rename from include_bsd/mtlib.h
rename to include/freebsd/mtlib.h
diff --git a/include_bsd/ncurses.h b/include/freebsd/ncurses.h
similarity index 100%
rename from include_bsd/ncurses.h
rename to include/freebsd/ncurses.h
diff --git a/include_bsd/ncurses_dll.h b/include/freebsd/ncurses_dll.h
similarity index 100%
rename from include_bsd/ncurses_dll.h
rename to include/freebsd/ncurses_dll.h
diff --git a/include_bsd/ndbm.h b/include/freebsd/ndbm.h
similarity index 100%
rename from include_bsd/ndbm.h
rename to include/freebsd/ndbm.h
diff --git a/include_bsd/net/altq/altq.h b/include/freebsd/net/altq/altq.h
similarity index 100%
rename from include_bsd/net/altq/altq.h
rename to include/freebsd/net/altq/altq.h
diff --git a/include_bsd/net/altq/altq_cbq.h b/include/freebsd/net/altq/altq_cbq.h
similarity index 100%
rename from include_bsd/net/altq/altq_cbq.h
rename to include/freebsd/net/altq/altq_cbq.h
diff --git a/include_bsd/net/altq/altq_cdnr.h b/include/freebsd/net/altq/altq_cdnr.h
similarity index 100%
rename from include_bsd/net/altq/altq_cdnr.h
rename to include/freebsd/net/altq/altq_cdnr.h
diff --git a/include_bsd/net/altq/altq_classq.h b/include/freebsd/net/altq/altq_classq.h
similarity index 100%
rename from include_bsd/net/altq/altq_classq.h
rename to include/freebsd/net/altq/altq_classq.h
diff --git a/include_bsd/net/altq/altq_codel.h b/include/freebsd/net/altq/altq_codel.h
similarity index 100%
rename from include_bsd/net/altq/altq_codel.h
rename to include/freebsd/net/altq/altq_codel.h
diff --git a/include_bsd/net/altq/altq_fairq.h b/include/freebsd/net/altq/altq_fairq.h
similarity index 100%
rename from include_bsd/net/altq/altq_fairq.h
rename to include/freebsd/net/altq/altq_fairq.h
diff --git a/include_bsd/net/altq/altq_hfsc.h b/include/freebsd/net/altq/altq_hfsc.h
similarity index 100%
rename from include_bsd/net/altq/altq_hfsc.h
rename to include/freebsd/net/altq/altq_hfsc.h
diff --git a/include_bsd/net/altq/altq_priq.h b/include/freebsd/net/altq/altq_priq.h
similarity index 100%
rename from include_bsd/net/altq/altq_priq.h
rename to include/freebsd/net/altq/altq_priq.h
diff --git a/include_bsd/net/altq/altq_red.h b/include/freebsd/net/altq/altq_red.h
similarity index 100%
rename from include_bsd/net/altq/altq_red.h
rename to include/freebsd/net/altq/altq_red.h
diff --git a/include_bsd/net/altq/altq_rio.h b/include/freebsd/net/altq/altq_rio.h
similarity index 100%
rename from include_bsd/net/altq/altq_rio.h
rename to include/freebsd/net/altq/altq_rio.h
diff --git a/include_bsd/net/altq/altq_rmclass.h b/include/freebsd/net/altq/altq_rmclass.h
similarity index 100%
rename from include_bsd/net/altq/altq_rmclass.h
rename to include/freebsd/net/altq/altq_rmclass.h
diff --git a/include_bsd/net/altq/altq_rmclass_debug.h b/include/freebsd/net/altq/altq_rmclass_debug.h
similarity index 100%
rename from include_bsd/net/altq/altq_rmclass_debug.h
rename to include/freebsd/net/altq/altq_rmclass_debug.h
diff --git a/include_bsd/net/altq/altq_var.h b/include/freebsd/net/altq/altq_var.h
similarity index 100%
rename from include_bsd/net/altq/altq_var.h
rename to include/freebsd/net/altq/altq_var.h
diff --git a/include_bsd/net/altq/if_altq.h b/include/freebsd/net/altq/if_altq.h
similarity index 100%
rename from include_bsd/net/altq/if_altq.h
rename to include/freebsd/net/altq/if_altq.h
diff --git a/include_bsd/net/bpf.h b/include/freebsd/net/bpf.h
similarity index 100%
rename from include_bsd/net/bpf.h
rename to include/freebsd/net/bpf.h
diff --git a/include_bsd/net/bpf_buffer.h b/include/freebsd/net/bpf_buffer.h
similarity index 100%
rename from include_bsd/net/bpf_buffer.h
rename to include/freebsd/net/bpf_buffer.h
diff --git a/include_bsd/net/bpf_jitter.h b/include/freebsd/net/bpf_jitter.h
similarity index 100%
rename from include_bsd/net/bpf_jitter.h
rename to include/freebsd/net/bpf_jitter.h
diff --git a/include_bsd/net/bpf_zerocopy.h b/include/freebsd/net/bpf_zerocopy.h
similarity index 100%
rename from include_bsd/net/bpf_zerocopy.h
rename to include/freebsd/net/bpf_zerocopy.h
diff --git a/include_bsd/net/bpfdesc.h b/include/freebsd/net/bpfdesc.h
similarity index 100%
rename from include_bsd/net/bpfdesc.h
rename to include/freebsd/net/bpfdesc.h
diff --git a/include_bsd/net/bridgestp.h b/include/freebsd/net/bridgestp.h
similarity index 100%
rename from include_bsd/net/bridgestp.h
rename to include/freebsd/net/bridgestp.h
diff --git a/include_bsd/net/ethernet.h b/include/freebsd/net/ethernet.h
similarity index 100%
rename from include_bsd/net/ethernet.h
rename to include/freebsd/net/ethernet.h
diff --git a/include_bsd/net/fddi.h b/include/freebsd/net/fddi.h
similarity index 100%
rename from include_bsd/net/fddi.h
rename to include/freebsd/net/fddi.h
diff --git a/include_bsd/net/firewire.h b/include/freebsd/net/firewire.h
similarity index 100%
rename from include_bsd/net/firewire.h
rename to include/freebsd/net/firewire.h
diff --git a/include_bsd/net/flowtable.h b/include/freebsd/net/flowtable.h
similarity index 100%
rename from include_bsd/net/flowtable.h
rename to include/freebsd/net/flowtable.h
diff --git a/include_bsd/net/ieee8023ad_lacp.h b/include/freebsd/net/ieee8023ad_lacp.h
similarity index 100%
rename from include_bsd/net/ieee8023ad_lacp.h
rename to include/freebsd/net/ieee8023ad_lacp.h
diff --git a/include_bsd/net/ieee_oui.h b/include/freebsd/net/ieee_oui.h
similarity index 100%
rename from include_bsd/net/ieee_oui.h
rename to include/freebsd/net/ieee_oui.h
diff --git a/include_bsd/net/if.h b/include/freebsd/net/if.h
similarity index 100%
rename from include_bsd/net/if.h
rename to include/freebsd/net/if.h
diff --git a/include_bsd/net/if_arc.h b/include/freebsd/net/if_arc.h
similarity index 100%
rename from include_bsd/net/if_arc.h
rename to include/freebsd/net/if_arc.h
diff --git a/include_bsd/net/if_arp.h b/include/freebsd/net/if_arp.h
similarity index 100%
rename from include_bsd/net/if_arp.h
rename to include/freebsd/net/if_arp.h
diff --git a/include_bsd/net/if_atm.h b/include/freebsd/net/if_atm.h
similarity index 100%
rename from include_bsd/net/if_atm.h
rename to include/freebsd/net/if_atm.h
diff --git a/include_bsd/net/if_bridgevar.h b/include/freebsd/net/if_bridgevar.h
similarity index 100%
rename from include_bsd/net/if_bridgevar.h
rename to include/freebsd/net/if_bridgevar.h
diff --git a/include_bsd/net/if_clone.h b/include/freebsd/net/if_clone.h
similarity index 100%
rename from include_bsd/net/if_clone.h
rename to include/freebsd/net/if_clone.h
diff --git a/include_bsd/net/if_dl.h b/include/freebsd/net/if_dl.h
similarity index 100%
rename from include_bsd/net/if_dl.h
rename to include/freebsd/net/if_dl.h
diff --git a/include_bsd/net/if_enc.h b/include/freebsd/net/if_enc.h
similarity index 100%
rename from include_bsd/net/if_enc.h
rename to include/freebsd/net/if_enc.h
diff --git a/include_bsd/net/if_gif.h b/include/freebsd/net/if_gif.h
similarity index 100%
rename from include_bsd/net/if_gif.h
rename to include/freebsd/net/if_gif.h
diff --git a/include_bsd/net/if_gre.h b/include/freebsd/net/if_gre.h
similarity index 100%
rename from include_bsd/net/if_gre.h
rename to include/freebsd/net/if_gre.h
diff --git a/include_bsd/net/if_lagg.h b/include/freebsd/net/if_lagg.h
similarity index 100%
rename from include_bsd/net/if_lagg.h
rename to include/freebsd/net/if_lagg.h
diff --git a/include_bsd/net/if_llatbl.h b/include/freebsd/net/if_llatbl.h
similarity index 100%
rename from include_bsd/net/if_llatbl.h
rename to include/freebsd/net/if_llatbl.h
diff --git a/include_bsd/net/if_llc.h b/include/freebsd/net/if_llc.h
similarity index 100%
rename from include_bsd/net/if_llc.h
rename to include/freebsd/net/if_llc.h
diff --git a/include_bsd/net/if_media.h b/include/freebsd/net/if_media.h
similarity index 100%
rename from include_bsd/net/if_media.h
rename to include/freebsd/net/if_media.h
diff --git a/include_bsd/net/if_mib.h b/include/freebsd/net/if_mib.h
similarity index 100%
rename from include_bsd/net/if_mib.h
rename to include/freebsd/net/if_mib.h
diff --git a/include_bsd/net/if_pflog.h b/include/freebsd/net/if_pflog.h
similarity index 100%
rename from include_bsd/net/if_pflog.h
rename to include/freebsd/net/if_pflog.h
diff --git a/include_bsd/net/if_pfsync.h b/include/freebsd/net/if_pfsync.h
similarity index 100%
rename from include_bsd/net/if_pfsync.h
rename to include/freebsd/net/if_pfsync.h
diff --git a/include_bsd/net/if_sppp.h b/include/freebsd/net/if_sppp.h
similarity index 100%
rename from include_bsd/net/if_sppp.h
rename to include/freebsd/net/if_sppp.h
diff --git a/include_bsd/net/if_tap.h b/include/freebsd/net/if_tap.h
similarity index 100%
rename from include_bsd/net/if_tap.h
rename to include/freebsd/net/if_tap.h
diff --git a/include_bsd/net/if_tapvar.h b/include/freebsd/net/if_tapvar.h
similarity index 100%
rename from include_bsd/net/if_tapvar.h
rename to include/freebsd/net/if_tapvar.h
diff --git a/include_bsd/net/if_tun.h b/include/freebsd/net/if_tun.h
similarity index 100%
rename from include_bsd/net/if_tun.h
rename to include/freebsd/net/if_tun.h
diff --git a/include_bsd/net/if_types.h b/include/freebsd/net/if_types.h
similarity index 100%
rename from include_bsd/net/if_types.h
rename to include/freebsd/net/if_types.h
diff --git a/include_bsd/net/if_var.h b/include/freebsd/net/if_var.h
similarity index 100%
rename from include_bsd/net/if_var.h
rename to include/freebsd/net/if_var.h
diff --git a/include_bsd/net/if_vlan_var.h b/include/freebsd/net/if_vlan_var.h
similarity index 100%
rename from include_bsd/net/if_vlan_var.h
rename to include/freebsd/net/if_vlan_var.h
diff --git a/include_bsd/net/if_vxlan.h b/include/freebsd/net/if_vxlan.h
similarity index 100%
rename from include_bsd/net/if_vxlan.h
rename to include/freebsd/net/if_vxlan.h
diff --git a/include_bsd/net/iflib.h b/include/freebsd/net/iflib.h
similarity index 100%
rename from include_bsd/net/iflib.h
rename to include/freebsd/net/iflib.h
diff --git a/include_bsd/net/ifq.h b/include/freebsd/net/ifq.h
similarity index 100%
rename from include_bsd/net/ifq.h
rename to include/freebsd/net/ifq.h
diff --git a/include_bsd/net/iso88025.h b/include/freebsd/net/iso88025.h
similarity index 100%
rename from include_bsd/net/iso88025.h
rename to include/freebsd/net/iso88025.h
diff --git a/include_bsd/net/mp_ring.h b/include/freebsd/net/mp_ring.h
similarity index 100%
rename from include_bsd/net/mp_ring.h
rename to include/freebsd/net/mp_ring.h
diff --git a/include_bsd/net/mppc.h b/include/freebsd/net/mppc.h
similarity index 100%
rename from include_bsd/net/mppc.h
rename to include/freebsd/net/mppc.h
diff --git a/include_bsd/net/netisr.h b/include/freebsd/net/netisr.h
similarity index 100%
rename from include_bsd/net/netisr.h
rename to include/freebsd/net/netisr.h
diff --git a/include_bsd/net/netisr_internal.h b/include/freebsd/net/netisr_internal.h
similarity index 100%
rename from include_bsd/net/netisr_internal.h
rename to include/freebsd/net/netisr_internal.h
diff --git a/include_bsd/net/netmap.h b/include/freebsd/net/netmap.h
similarity index 100%
rename from include_bsd/net/netmap.h
rename to include/freebsd/net/netmap.h
diff --git a/include_bsd/net/netmap_user.h b/include/freebsd/net/netmap_user.h
similarity index 100%
rename from include_bsd/net/netmap_user.h
rename to include/freebsd/net/netmap_user.h
diff --git a/include_bsd/net/paravirt.h b/include/freebsd/net/paravirt.h
similarity index 100%
rename from include_bsd/net/paravirt.h
rename to include/freebsd/net/paravirt.h
diff --git a/include_bsd/net/pfil.h b/include/freebsd/net/pfil.h
similarity index 100%
rename from include_bsd/net/pfil.h
rename to include/freebsd/net/pfil.h
diff --git a/include_bsd/net/pfkeyv2.h b/include/freebsd/net/pfkeyv2.h
similarity index 100%
rename from include_bsd/net/pfkeyv2.h
rename to include/freebsd/net/pfkeyv2.h
diff --git a/include_bsd/net/pfvar.h b/include/freebsd/net/pfvar.h
similarity index 100%
rename from include_bsd/net/pfvar.h
rename to include/freebsd/net/pfvar.h
diff --git a/include_bsd/net/ppp_defs.h b/include/freebsd/net/ppp_defs.h
similarity index 100%
rename from include_bsd/net/ppp_defs.h
rename to include/freebsd/net/ppp_defs.h
diff --git a/include_bsd/net/radix.h b/include/freebsd/net/radix.h
similarity index 100%
rename from include_bsd/net/radix.h
rename to include/freebsd/net/radix.h
diff --git a/include_bsd/net/radix_mpath.h b/include/freebsd/net/radix_mpath.h
similarity index 100%
rename from include_bsd/net/radix_mpath.h
rename to include/freebsd/net/radix_mpath.h
diff --git a/include_bsd/net/raw_cb.h b/include/freebsd/net/raw_cb.h
similarity index 100%
rename from include_bsd/net/raw_cb.h
rename to include/freebsd/net/raw_cb.h
diff --git a/include_bsd/net/route.h b/include/freebsd/net/route.h
similarity index 100%
rename from include_bsd/net/route.h
rename to include/freebsd/net/route.h
diff --git a/include_bsd/net/route_var.h b/include/freebsd/net/route_var.h
similarity index 100%
rename from include_bsd/net/route_var.h
rename to include/freebsd/net/route_var.h
diff --git a/include_bsd/net/rss_config.h b/include/freebsd/net/rss_config.h
similarity index 100%
rename from include_bsd/net/rss_config.h
rename to include/freebsd/net/rss_config.h
diff --git a/include_bsd/net/sff8436.h b/include/freebsd/net/sff8436.h
similarity index 100%
rename from include_bsd/net/sff8436.h
rename to include/freebsd/net/sff8436.h
diff --git a/include_bsd/net/sff8472.h b/include/freebsd/net/sff8472.h
similarity index 100%
rename from include_bsd/net/sff8472.h
rename to include/freebsd/net/sff8472.h
diff --git a/include_bsd/net/slcompress.h b/include/freebsd/net/slcompress.h
similarity index 100%
rename from include_bsd/net/slcompress.h
rename to include/freebsd/net/slcompress.h
diff --git a/include_bsd/net/toeplitz.h b/include/freebsd/net/toeplitz.h
similarity index 100%
rename from include_bsd/net/toeplitz.h
rename to include/freebsd/net/toeplitz.h
diff --git a/include_bsd/net/vnet.h b/include/freebsd/net/vnet.h
similarity index 100%
rename from include_bsd/net/vnet.h
rename to include/freebsd/net/vnet.h
diff --git a/include_bsd/net80211/_ieee80211.h b/include/freebsd/net80211/_ieee80211.h
similarity index 100%
rename from include_bsd/net80211/_ieee80211.h
rename to include/freebsd/net80211/_ieee80211.h
diff --git a/include_bsd/net80211/ieee80211.h b/include/freebsd/net80211/ieee80211.h
similarity index 100%
rename from include_bsd/net80211/ieee80211.h
rename to include/freebsd/net80211/ieee80211.h
diff --git a/include_bsd/net80211/ieee80211_action.h b/include/freebsd/net80211/ieee80211_action.h
similarity index 100%
rename from include_bsd/net80211/ieee80211_action.h
rename to include/freebsd/net80211/ieee80211_action.h
diff --git a/include_bsd/net80211/ieee80211_adhoc.h b/include/freebsd/net80211/ieee80211_adhoc.h
similarity index 100%
rename from include_bsd/net80211/ieee80211_adhoc.h
rename to include/freebsd/net80211/ieee80211_adhoc.h
diff --git a/include_bsd/net80211/ieee80211_ageq.h b/include/freebsd/net80211/ieee80211_ageq.h
similarity index 100%
rename from include_bsd/net80211/ieee80211_ageq.h
rename to include/freebsd/net80211/ieee80211_ageq.h
diff --git a/include_bsd/net80211/ieee80211_alq.h b/include/freebsd/net80211/ieee80211_alq.h
similarity index 100%
rename from include_bsd/net80211/ieee80211_alq.h
rename to include/freebsd/net80211/ieee80211_alq.h
diff --git a/include_bsd/net80211/ieee80211_amrr.h b/include/freebsd/net80211/ieee80211_amrr.h
similarity index 100%
rename from include_bsd/net80211/ieee80211_amrr.h
rename to include/freebsd/net80211/ieee80211_amrr.h
diff --git a/include_bsd/net80211/ieee80211_crypto.h b/include/freebsd/net80211/ieee80211_crypto.h
similarity index 100%
rename from include_bsd/net80211/ieee80211_crypto.h
rename to include/freebsd/net80211/ieee80211_crypto.h
diff --git a/include_bsd/net80211/ieee80211_dfs.h b/include/freebsd/net80211/ieee80211_dfs.h
similarity index 100%
rename from include_bsd/net80211/ieee80211_dfs.h
rename to include/freebsd/net80211/ieee80211_dfs.h
diff --git a/include_bsd/net80211/ieee80211_freebsd.h b/include/freebsd/net80211/ieee80211_freebsd.h
similarity index 100%
rename from include_bsd/net80211/ieee80211_freebsd.h
rename to include/freebsd/net80211/ieee80211_freebsd.h
diff --git a/include_bsd/net80211/ieee80211_hostap.h b/include/freebsd/net80211/ieee80211_hostap.h
similarity index 100%
rename from include_bsd/net80211/ieee80211_hostap.h
rename to include/freebsd/net80211/ieee80211_hostap.h
diff --git a/include_bsd/net80211/ieee80211_ht.h b/include/freebsd/net80211/ieee80211_ht.h
similarity index 100%
rename from include_bsd/net80211/ieee80211_ht.h
rename to include/freebsd/net80211/ieee80211_ht.h
diff --git a/include_bsd/net80211/ieee80211_input.h b/include/freebsd/net80211/ieee80211_input.h
similarity index 100%
rename from include_bsd/net80211/ieee80211_input.h
rename to include/freebsd/net80211/ieee80211_input.h
diff --git a/include_bsd/net80211/ieee80211_ioctl.h b/include/freebsd/net80211/ieee80211_ioctl.h
similarity index 100%
rename from include_bsd/net80211/ieee80211_ioctl.h
rename to include/freebsd/net80211/ieee80211_ioctl.h
diff --git a/include_bsd/net80211/ieee80211_mesh.h b/include/freebsd/net80211/ieee80211_mesh.h
similarity index 100%
rename from include_bsd/net80211/ieee80211_mesh.h
rename to include/freebsd/net80211/ieee80211_mesh.h
diff --git a/include_bsd/net80211/ieee80211_monitor.h b/include/freebsd/net80211/ieee80211_monitor.h
similarity index 100%
rename from include_bsd/net80211/ieee80211_monitor.h
rename to include/freebsd/net80211/ieee80211_monitor.h
diff --git a/include_bsd/net80211/ieee80211_node.h b/include/freebsd/net80211/ieee80211_node.h
similarity index 100%
rename from include_bsd/net80211/ieee80211_node.h
rename to include/freebsd/net80211/ieee80211_node.h
diff --git a/include_bsd/net80211/ieee80211_phy.h b/include/freebsd/net80211/ieee80211_phy.h
similarity index 100%
rename from include_bsd/net80211/ieee80211_phy.h
rename to include/freebsd/net80211/ieee80211_phy.h
diff --git a/include_bsd/net80211/ieee80211_power.h b/include/freebsd/net80211/ieee80211_power.h
similarity index 100%
rename from include_bsd/net80211/ieee80211_power.h
rename to include/freebsd/net80211/ieee80211_power.h
diff --git a/include_bsd/net80211/ieee80211_proto.h b/include/freebsd/net80211/ieee80211_proto.h
similarity index 100%
rename from include_bsd/net80211/ieee80211_proto.h
rename to include/freebsd/net80211/ieee80211_proto.h
diff --git a/include_bsd/net80211/ieee80211_radiotap.h b/include/freebsd/net80211/ieee80211_radiotap.h
similarity index 100%
rename from include_bsd/net80211/ieee80211_radiotap.h
rename to include/freebsd/net80211/ieee80211_radiotap.h
diff --git a/include_bsd/net80211/ieee80211_ratectl.h b/include/freebsd/net80211/ieee80211_ratectl.h
similarity index 100%
rename from include_bsd/net80211/ieee80211_ratectl.h
rename to include/freebsd/net80211/ieee80211_ratectl.h
diff --git a/include_bsd/net80211/ieee80211_regdomain.h b/include/freebsd/net80211/ieee80211_regdomain.h
similarity index 100%
rename from include_bsd/net80211/ieee80211_regdomain.h
rename to include/freebsd/net80211/ieee80211_regdomain.h
diff --git a/include_bsd/net80211/ieee80211_rssadapt.h b/include/freebsd/net80211/ieee80211_rssadapt.h
similarity index 100%
rename from include_bsd/net80211/ieee80211_rssadapt.h
rename to include/freebsd/net80211/ieee80211_rssadapt.h
diff --git a/include_bsd/net80211/ieee80211_scan.h b/include/freebsd/net80211/ieee80211_scan.h
similarity index 100%
rename from include_bsd/net80211/ieee80211_scan.h
rename to include/freebsd/net80211/ieee80211_scan.h
diff --git a/include_bsd/net80211/ieee80211_scan_sw.h b/include/freebsd/net80211/ieee80211_scan_sw.h
similarity index 100%
rename from include_bsd/net80211/ieee80211_scan_sw.h
rename to include/freebsd/net80211/ieee80211_scan_sw.h
diff --git a/include_bsd/net80211/ieee80211_sta.h b/include/freebsd/net80211/ieee80211_sta.h
similarity index 100%
rename from include_bsd/net80211/ieee80211_sta.h
rename to include/freebsd/net80211/ieee80211_sta.h
diff --git a/include_bsd/net80211/ieee80211_superg.h b/include/freebsd/net80211/ieee80211_superg.h
similarity index 100%
rename from include_bsd/net80211/ieee80211_superg.h
rename to include/freebsd/net80211/ieee80211_superg.h
diff --git a/include_bsd/net80211/ieee80211_tdma.h b/include/freebsd/net80211/ieee80211_tdma.h
similarity index 100%
rename from include_bsd/net80211/ieee80211_tdma.h
rename to include/freebsd/net80211/ieee80211_tdma.h
diff --git a/include_bsd/net80211/ieee80211_var.h b/include/freebsd/net80211/ieee80211_var.h
similarity index 100%
rename from include_bsd/net80211/ieee80211_var.h
rename to include/freebsd/net80211/ieee80211_var.h
diff --git a/include_bsd/net80211/ieee80211_wds.h b/include/freebsd/net80211/ieee80211_wds.h
similarity index 100%
rename from include_bsd/net80211/ieee80211_wds.h
rename to include/freebsd/net80211/ieee80211_wds.h
diff --git a/include_bsd/netconfig.h b/include/freebsd/netconfig.h
similarity index 100%
rename from include_bsd/netconfig.h
rename to include/freebsd/netconfig.h
diff --git a/include_bsd/netdb.h b/include/freebsd/netdb.h
similarity index 100%
rename from include_bsd/netdb.h
rename to include/freebsd/netdb.h
diff --git a/include_bsd/netgraph.h b/include/freebsd/netgraph.h
similarity index 100%
rename from include_bsd/netgraph.h
rename to include/freebsd/netgraph.h
diff --git a/include_bsd/netgraph/atm/ng_atm.h b/include/freebsd/netgraph/atm/ng_atm.h
similarity index 100%
rename from include_bsd/netgraph/atm/ng_atm.h
rename to include/freebsd/netgraph/atm/ng_atm.h
diff --git a/include_bsd/netgraph/atm/ng_ccatm.h b/include/freebsd/netgraph/atm/ng_ccatm.h
similarity index 100%
rename from include_bsd/netgraph/atm/ng_ccatm.h
rename to include/freebsd/netgraph/atm/ng_ccatm.h
diff --git a/include_bsd/netgraph/atm/ng_sscfu.h b/include/freebsd/netgraph/atm/ng_sscfu.h
similarity index 100%
rename from include_bsd/netgraph/atm/ng_sscfu.h
rename to include/freebsd/netgraph/atm/ng_sscfu.h
diff --git a/include_bsd/netgraph/atm/ng_sscop.h b/include/freebsd/netgraph/atm/ng_sscop.h
similarity index 100%
rename from include_bsd/netgraph/atm/ng_sscop.h
rename to include/freebsd/netgraph/atm/ng_sscop.h
diff --git a/include_bsd/netgraph/atm/ng_uni.h b/include/freebsd/netgraph/atm/ng_uni.h
similarity index 100%
rename from include_bsd/netgraph/atm/ng_uni.h
rename to include/freebsd/netgraph/atm/ng_uni.h
diff --git a/include_bsd/netgraph/atm/ngatmbase.h b/include/freebsd/netgraph/atm/ngatmbase.h
similarity index 100%
rename from include_bsd/netgraph/atm/ngatmbase.h
rename to include/freebsd/netgraph/atm/ngatmbase.h
diff --git a/include_bsd/netgraph/bluetooth/include/ng_bluetooth.h b/include/freebsd/netgraph/bluetooth/include/ng_bluetooth.h
similarity index 100%
rename from include_bsd/netgraph/bluetooth/include/ng_bluetooth.h
rename to include/freebsd/netgraph/bluetooth/include/ng_bluetooth.h
diff --git a/include_bsd/netgraph/bluetooth/include/ng_bt3c.h b/include/freebsd/netgraph/bluetooth/include/ng_bt3c.h
similarity index 100%
rename from include_bsd/netgraph/bluetooth/include/ng_bt3c.h
rename to include/freebsd/netgraph/bluetooth/include/ng_bt3c.h
diff --git a/include_bsd/netgraph/bluetooth/include/ng_btsocket.h b/include/freebsd/netgraph/bluetooth/include/ng_btsocket.h
similarity index 100%
rename from include_bsd/netgraph/bluetooth/include/ng_btsocket.h
rename to include/freebsd/netgraph/bluetooth/include/ng_btsocket.h
diff --git a/include_bsd/netgraph/bluetooth/include/ng_btsocket_hci_raw.h b/include/freebsd/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
similarity index 100%
rename from include_bsd/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
rename to include/freebsd/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
diff --git a/include_bsd/netgraph/bluetooth/include/ng_btsocket_l2cap.h b/include/freebsd/netgraph/bluetooth/include/ng_btsocket_l2cap.h
similarity index 100%
rename from include_bsd/netgraph/bluetooth/include/ng_btsocket_l2cap.h
rename to include/freebsd/netgraph/bluetooth/include/ng_btsocket_l2cap.h
diff --git a/include_bsd/netgraph/bluetooth/include/ng_btsocket_rfcomm.h b/include/freebsd/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
similarity index 100%
rename from include_bsd/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
rename to include/freebsd/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
diff --git a/include_bsd/netgraph/bluetooth/include/ng_btsocket_sco.h b/include/freebsd/netgraph/bluetooth/include/ng_btsocket_sco.h
similarity index 100%
rename from include_bsd/netgraph/bluetooth/include/ng_btsocket_sco.h
rename to include/freebsd/netgraph/bluetooth/include/ng_btsocket_sco.h
diff --git a/include_bsd/netgraph/bluetooth/include/ng_h4.h b/include/freebsd/netgraph/bluetooth/include/ng_h4.h
similarity index 100%
rename from include_bsd/netgraph/bluetooth/include/ng_h4.h
rename to include/freebsd/netgraph/bluetooth/include/ng_h4.h
diff --git a/include_bsd/netgraph/bluetooth/include/ng_hci.h b/include/freebsd/netgraph/bluetooth/include/ng_hci.h
similarity index 100%
rename from include_bsd/netgraph/bluetooth/include/ng_hci.h
rename to include/freebsd/netgraph/bluetooth/include/ng_hci.h
diff --git a/include_bsd/netgraph/bluetooth/include/ng_l2cap.h b/include/freebsd/netgraph/bluetooth/include/ng_l2cap.h
similarity index 100%
rename from include_bsd/netgraph/bluetooth/include/ng_l2cap.h
rename to include/freebsd/netgraph/bluetooth/include/ng_l2cap.h
diff --git a/include_bsd/netgraph/bluetooth/include/ng_ubt.h b/include/freebsd/netgraph/bluetooth/include/ng_ubt.h
similarity index 100%
rename from include_bsd/netgraph/bluetooth/include/ng_ubt.h
rename to include/freebsd/netgraph/bluetooth/include/ng_ubt.h
diff --git a/include_bsd/netgraph/netflow/netflow.h b/include/freebsd/netgraph/netflow/netflow.h
similarity index 100%
rename from include_bsd/netgraph/netflow/netflow.h
rename to include/freebsd/netgraph/netflow/netflow.h
diff --git a/include_bsd/netgraph/netflow/netflow_v9.h b/include/freebsd/netgraph/netflow/netflow_v9.h
similarity index 100%
rename from include_bsd/netgraph/netflow/netflow_v9.h
rename to include/freebsd/netgraph/netflow/netflow_v9.h
diff --git a/include_bsd/netgraph/netflow/ng_netflow.h b/include/freebsd/netgraph/netflow/ng_netflow.h
similarity index 100%
rename from include_bsd/netgraph/netflow/ng_netflow.h
rename to include/freebsd/netgraph/netflow/ng_netflow.h
diff --git a/include_bsd/netgraph/netgraph.h b/include/freebsd/netgraph/netgraph.h
similarity index 100%
rename from include_bsd/netgraph/netgraph.h
rename to include/freebsd/netgraph/netgraph.h
diff --git a/include_bsd/netgraph/ng_UI.h b/include/freebsd/netgraph/ng_UI.h
similarity index 100%
rename from include_bsd/netgraph/ng_UI.h
rename to include/freebsd/netgraph/ng_UI.h
diff --git a/include_bsd/netgraph/ng_async.h b/include/freebsd/netgraph/ng_async.h
similarity index 100%
rename from include_bsd/netgraph/ng_async.h
rename to include/freebsd/netgraph/ng_async.h
diff --git a/include_bsd/netgraph/ng_atmllc.h b/include/freebsd/netgraph/ng_atmllc.h
similarity index 100%
rename from include_bsd/netgraph/ng_atmllc.h
rename to include/freebsd/netgraph/ng_atmllc.h
diff --git a/include_bsd/netgraph/ng_bpf.h b/include/freebsd/netgraph/ng_bpf.h
similarity index 100%
rename from include_bsd/netgraph/ng_bpf.h
rename to include/freebsd/netgraph/ng_bpf.h
diff --git a/include_bsd/netgraph/ng_bridge.h b/include/freebsd/netgraph/ng_bridge.h
similarity index 100%
rename from include_bsd/netgraph/ng_bridge.h
rename to include/freebsd/netgraph/ng_bridge.h
diff --git a/include_bsd/netgraph/ng_car.h b/include/freebsd/netgraph/ng_car.h
similarity index 100%
rename from include_bsd/netgraph/ng_car.h
rename to include/freebsd/netgraph/ng_car.h
diff --git a/include_bsd/netgraph/ng_cisco.h b/include/freebsd/netgraph/ng_cisco.h
similarity index 100%
rename from include_bsd/netgraph/ng_cisco.h
rename to include/freebsd/netgraph/ng_cisco.h
diff --git a/include_bsd/netgraph/ng_deflate.h b/include/freebsd/netgraph/ng_deflate.h
similarity index 100%
rename from include_bsd/netgraph/ng_deflate.h
rename to include/freebsd/netgraph/ng_deflate.h
diff --git a/include_bsd/netgraph/ng_device.h b/include/freebsd/netgraph/ng_device.h
similarity index 100%
rename from include_bsd/netgraph/ng_device.h
rename to include/freebsd/netgraph/ng_device.h
diff --git a/include_bsd/netgraph/ng_echo.h b/include/freebsd/netgraph/ng_echo.h
similarity index 100%
rename from include_bsd/netgraph/ng_echo.h
rename to include/freebsd/netgraph/ng_echo.h
diff --git a/include_bsd/netgraph/ng_eiface.h b/include/freebsd/netgraph/ng_eiface.h
similarity index 100%
rename from include_bsd/netgraph/ng_eiface.h
rename to include/freebsd/netgraph/ng_eiface.h
diff --git a/include_bsd/netgraph/ng_etf.h b/include/freebsd/netgraph/ng_etf.h
similarity index 100%
rename from include_bsd/netgraph/ng_etf.h
rename to include/freebsd/netgraph/ng_etf.h
diff --git a/include_bsd/netgraph/ng_ether.h b/include/freebsd/netgraph/ng_ether.h
similarity index 100%
rename from include_bsd/netgraph/ng_ether.h
rename to include/freebsd/netgraph/ng_ether.h
diff --git a/include_bsd/netgraph/ng_ether_echo.h b/include/freebsd/netgraph/ng_ether_echo.h
similarity index 100%
rename from include_bsd/netgraph/ng_ether_echo.h
rename to include/freebsd/netgraph/ng_ether_echo.h
diff --git a/include_bsd/netgraph/ng_frame_relay.h b/include/freebsd/netgraph/ng_frame_relay.h
similarity index 100%
rename from include_bsd/netgraph/ng_frame_relay.h
rename to include/freebsd/netgraph/ng_frame_relay.h
diff --git a/include_bsd/netgraph/ng_gif.h b/include/freebsd/netgraph/ng_gif.h
similarity index 100%
rename from include_bsd/netgraph/ng_gif.h
rename to include/freebsd/netgraph/ng_gif.h
diff --git a/include_bsd/netgraph/ng_gif_demux.h b/include/freebsd/netgraph/ng_gif_demux.h
similarity index 100%
rename from include_bsd/netgraph/ng_gif_demux.h
rename to include/freebsd/netgraph/ng_gif_demux.h
diff --git a/include_bsd/netgraph/ng_hole.h b/include/freebsd/netgraph/ng_hole.h
similarity index 100%
rename from include_bsd/netgraph/ng_hole.h
rename to include/freebsd/netgraph/ng_hole.h
diff --git a/include_bsd/netgraph/ng_hub.h b/include/freebsd/netgraph/ng_hub.h
similarity index 100%
rename from include_bsd/netgraph/ng_hub.h
rename to include/freebsd/netgraph/ng_hub.h
diff --git a/include_bsd/netgraph/ng_iface.h b/include/freebsd/netgraph/ng_iface.h
similarity index 100%
rename from include_bsd/netgraph/ng_iface.h
rename to include/freebsd/netgraph/ng_iface.h
diff --git a/include_bsd/netgraph/ng_ip_input.h b/include/freebsd/netgraph/ng_ip_input.h
similarity index 100%
rename from include_bsd/netgraph/ng_ip_input.h
rename to include/freebsd/netgraph/ng_ip_input.h
diff --git a/include_bsd/netgraph/ng_ipfw.h b/include/freebsd/netgraph/ng_ipfw.h
similarity index 100%
rename from include_bsd/netgraph/ng_ipfw.h
rename to include/freebsd/netgraph/ng_ipfw.h
diff --git a/include_bsd/netgraph/ng_ksocket.h b/include/freebsd/netgraph/ng_ksocket.h
similarity index 100%
rename from include_bsd/netgraph/ng_ksocket.h
rename to include/freebsd/netgraph/ng_ksocket.h
diff --git a/include_bsd/netgraph/ng_l2tp.h b/include/freebsd/netgraph/ng_l2tp.h
similarity index 100%
rename from include_bsd/netgraph/ng_l2tp.h
rename to include/freebsd/netgraph/ng_l2tp.h
diff --git a/include_bsd/netgraph/ng_lmi.h b/include/freebsd/netgraph/ng_lmi.h
similarity index 100%
rename from include_bsd/netgraph/ng_lmi.h
rename to include/freebsd/netgraph/ng_lmi.h
diff --git a/include_bsd/netgraph/ng_message.h b/include/freebsd/netgraph/ng_message.h
similarity index 100%
rename from include_bsd/netgraph/ng_message.h
rename to include/freebsd/netgraph/ng_message.h
diff --git a/include_bsd/netgraph/ng_mppc.h b/include/freebsd/netgraph/ng_mppc.h
similarity index 100%
rename from include_bsd/netgraph/ng_mppc.h
rename to include/freebsd/netgraph/ng_mppc.h
diff --git a/include_bsd/netgraph/ng_nat.h b/include/freebsd/netgraph/ng_nat.h
similarity index 100%
rename from include_bsd/netgraph/ng_nat.h
rename to include/freebsd/netgraph/ng_nat.h
diff --git a/include_bsd/netgraph/ng_one2many.h b/include/freebsd/netgraph/ng_one2many.h
similarity index 100%
rename from include_bsd/netgraph/ng_one2many.h
rename to include/freebsd/netgraph/ng_one2many.h
diff --git a/include_bsd/netgraph/ng_parse.h b/include/freebsd/netgraph/ng_parse.h
similarity index 100%
rename from include_bsd/netgraph/ng_parse.h
rename to include/freebsd/netgraph/ng_parse.h
diff --git a/include_bsd/netgraph/ng_patch.h b/include/freebsd/netgraph/ng_patch.h
similarity index 100%
rename from include_bsd/netgraph/ng_patch.h
rename to include/freebsd/netgraph/ng_patch.h
diff --git a/include_bsd/netgraph/ng_pipe.h b/include/freebsd/netgraph/ng_pipe.h
similarity index 100%
rename from include_bsd/netgraph/ng_pipe.h
rename to include/freebsd/netgraph/ng_pipe.h
diff --git a/include_bsd/netgraph/ng_ppp.h b/include/freebsd/netgraph/ng_ppp.h
similarity index 100%
rename from include_bsd/netgraph/ng_ppp.h
rename to include/freebsd/netgraph/ng_ppp.h
diff --git a/include_bsd/netgraph/ng_pppoe.h b/include/freebsd/netgraph/ng_pppoe.h
similarity index 100%
rename from include_bsd/netgraph/ng_pppoe.h
rename to include/freebsd/netgraph/ng_pppoe.h
diff --git a/include_bsd/netgraph/ng_pptpgre.h b/include/freebsd/netgraph/ng_pptpgre.h
similarity index 100%
rename from include_bsd/netgraph/ng_pptpgre.h
rename to include/freebsd/netgraph/ng_pptpgre.h
diff --git a/include_bsd/netgraph/ng_pred1.h b/include/freebsd/netgraph/ng_pred1.h
similarity index 100%
rename from include_bsd/netgraph/ng_pred1.h
rename to include/freebsd/netgraph/ng_pred1.h
diff --git a/include_bsd/netgraph/ng_rfc1490.h b/include/freebsd/netgraph/ng_rfc1490.h
similarity index 100%
rename from include_bsd/netgraph/ng_rfc1490.h
rename to include/freebsd/netgraph/ng_rfc1490.h
diff --git a/include_bsd/netgraph/ng_sample.h b/include/freebsd/netgraph/ng_sample.h
similarity index 100%
rename from include_bsd/netgraph/ng_sample.h
rename to include/freebsd/netgraph/ng_sample.h
diff --git a/include_bsd/netgraph/ng_socket.h b/include/freebsd/netgraph/ng_socket.h
similarity index 100%
rename from include_bsd/netgraph/ng_socket.h
rename to include/freebsd/netgraph/ng_socket.h
diff --git a/include_bsd/netgraph/ng_socketvar.h b/include/freebsd/netgraph/ng_socketvar.h
similarity index 100%
rename from include_bsd/netgraph/ng_socketvar.h
rename to include/freebsd/netgraph/ng_socketvar.h
diff --git a/include_bsd/netgraph/ng_source.h b/include/freebsd/netgraph/ng_source.h
similarity index 100%
rename from include_bsd/netgraph/ng_source.h
rename to include/freebsd/netgraph/ng_source.h
diff --git a/include_bsd/netgraph/ng_split.h b/include/freebsd/netgraph/ng_split.h
similarity index 100%
rename from include_bsd/netgraph/ng_split.h
rename to include/freebsd/netgraph/ng_split.h
diff --git a/include_bsd/netgraph/ng_sppp.h b/include/freebsd/netgraph/ng_sppp.h
similarity index 100%
rename from include_bsd/netgraph/ng_sppp.h
rename to include/freebsd/netgraph/ng_sppp.h
diff --git a/include_bsd/netgraph/ng_tag.h b/include/freebsd/netgraph/ng_tag.h
similarity index 100%
rename from include_bsd/netgraph/ng_tag.h
rename to include/freebsd/netgraph/ng_tag.h
diff --git a/include_bsd/netgraph/ng_tcpmss.h b/include/freebsd/netgraph/ng_tcpmss.h
similarity index 100%
rename from include_bsd/netgraph/ng_tcpmss.h
rename to include/freebsd/netgraph/ng_tcpmss.h
diff --git a/include_bsd/netgraph/ng_tee.h b/include/freebsd/netgraph/ng_tee.h
similarity index 100%
rename from include_bsd/netgraph/ng_tee.h
rename to include/freebsd/netgraph/ng_tee.h
diff --git a/include_bsd/netgraph/ng_tty.h b/include/freebsd/netgraph/ng_tty.h
similarity index 100%
rename from include_bsd/netgraph/ng_tty.h
rename to include/freebsd/netgraph/ng_tty.h
diff --git a/include_bsd/netgraph/ng_vjc.h b/include/freebsd/netgraph/ng_vjc.h
similarity index 100%
rename from include_bsd/netgraph/ng_vjc.h
rename to include/freebsd/netgraph/ng_vjc.h
diff --git a/include_bsd/netgraph/ng_vlan.h b/include/freebsd/netgraph/ng_vlan.h
similarity index 100%
rename from include_bsd/netgraph/ng_vlan.h
rename to include/freebsd/netgraph/ng_vlan.h
diff --git a/include_bsd/netinet/cc/cc.h b/include/freebsd/netinet/cc/cc.h
similarity index 100%
rename from include_bsd/netinet/cc/cc.h
rename to include/freebsd/netinet/cc/cc.h
diff --git a/include_bsd/netinet/cc/cc_cubic.h b/include/freebsd/netinet/cc/cc_cubic.h
similarity index 100%
rename from include_bsd/netinet/cc/cc_cubic.h
rename to include/freebsd/netinet/cc/cc_cubic.h
diff --git a/include_bsd/netinet/cc/cc_module.h b/include/freebsd/netinet/cc/cc_module.h
similarity index 100%
rename from include_bsd/netinet/cc/cc_module.h
rename to include/freebsd/netinet/cc/cc_module.h
diff --git a/include_bsd/netinet/icmp6.h b/include/freebsd/netinet/icmp6.h
similarity index 100%
rename from include_bsd/netinet/icmp6.h
rename to include/freebsd/netinet/icmp6.h
diff --git a/include_bsd/netinet/icmp_var.h b/include/freebsd/netinet/icmp_var.h
similarity index 100%
rename from include_bsd/netinet/icmp_var.h
rename to include/freebsd/netinet/icmp_var.h
diff --git a/include_bsd/netinet/if_atm.h b/include/freebsd/netinet/if_atm.h
similarity index 100%
rename from include_bsd/netinet/if_atm.h
rename to include/freebsd/netinet/if_atm.h
diff --git a/include_bsd/netinet/if_ether.h b/include/freebsd/netinet/if_ether.h
similarity index 100%
rename from include_bsd/netinet/if_ether.h
rename to include/freebsd/netinet/if_ether.h
diff --git a/include_bsd/netinet/igmp.h b/include/freebsd/netinet/igmp.h
similarity index 100%
rename from include_bsd/netinet/igmp.h
rename to include/freebsd/netinet/igmp.h
diff --git a/include_bsd/netinet/igmp_var.h b/include/freebsd/netinet/igmp_var.h
similarity index 100%
rename from include_bsd/netinet/igmp_var.h
rename to include/freebsd/netinet/igmp_var.h
diff --git a/include_bsd/netinet/in.h b/include/freebsd/netinet/in.h
similarity index 100%
rename from include_bsd/netinet/in.h
rename to include/freebsd/netinet/in.h
diff --git a/include_bsd/netinet/in_fib.h b/include/freebsd/netinet/in_fib.h
similarity index 100%
rename from include_bsd/netinet/in_fib.h
rename to include/freebsd/netinet/in_fib.h
diff --git a/include_bsd/netinet/in_kdtrace.h b/include/freebsd/netinet/in_kdtrace.h
similarity index 100%
rename from include_bsd/netinet/in_kdtrace.h
rename to include/freebsd/netinet/in_kdtrace.h
diff --git a/include_bsd/netinet/in_pcb.h b/include/freebsd/netinet/in_pcb.h
similarity index 100%
rename from include_bsd/netinet/in_pcb.h
rename to include/freebsd/netinet/in_pcb.h
diff --git a/include_bsd/netinet/in_rss.h b/include/freebsd/netinet/in_rss.h
similarity index 100%
rename from include_bsd/netinet/in_rss.h
rename to include/freebsd/netinet/in_rss.h
diff --git a/include_bsd/netinet/in_systm.h b/include/freebsd/netinet/in_systm.h
similarity index 100%
rename from include_bsd/netinet/in_systm.h
rename to include/freebsd/netinet/in_systm.h
diff --git a/include_bsd/netinet/in_var.h b/include/freebsd/netinet/in_var.h
similarity index 100%
rename from include_bsd/netinet/in_var.h
rename to include/freebsd/netinet/in_var.h
diff --git a/include_bsd/netinet/ip.h b/include/freebsd/netinet/ip.h
similarity index 100%
rename from include_bsd/netinet/ip.h
rename to include/freebsd/netinet/ip.h
diff --git a/include_bsd/netinet/ip6.h b/include/freebsd/netinet/ip6.h
similarity index 100%
rename from include_bsd/netinet/ip6.h
rename to include/freebsd/netinet/ip6.h
diff --git a/include_bsd/netinet/ip_auth.h b/include/freebsd/netinet/ip_auth.h
similarity index 100%
rename from include_bsd/netinet/ip_auth.h
rename to include/freebsd/netinet/ip_auth.h
diff --git a/include_bsd/netinet/ip_carp.h b/include/freebsd/netinet/ip_carp.h
similarity index 100%
rename from include_bsd/netinet/ip_carp.h
rename to include/freebsd/netinet/ip_carp.h
diff --git a/include_bsd/netinet/ip_compat.h b/include/freebsd/netinet/ip_compat.h
similarity index 100%
rename from include_bsd/netinet/ip_compat.h
rename to include/freebsd/netinet/ip_compat.h
diff --git a/include_bsd/netinet/ip_divert.h b/include/freebsd/netinet/ip_divert.h
similarity index 100%
rename from include_bsd/netinet/ip_divert.h
rename to include/freebsd/netinet/ip_divert.h
diff --git a/include_bsd/netinet/ip_dstlist.h b/include/freebsd/netinet/ip_dstlist.h
similarity index 100%
rename from include_bsd/netinet/ip_dstlist.h
rename to include/freebsd/netinet/ip_dstlist.h
diff --git a/include_bsd/netinet/ip_dummynet.h b/include/freebsd/netinet/ip_dummynet.h
similarity index 100%
rename from include_bsd/netinet/ip_dummynet.h
rename to include/freebsd/netinet/ip_dummynet.h
diff --git a/include_bsd/netinet/ip_ecn.h b/include/freebsd/netinet/ip_ecn.h
similarity index 100%
rename from include_bsd/netinet/ip_ecn.h
rename to include/freebsd/netinet/ip_ecn.h
diff --git a/include_bsd/netinet/ip_encap.h b/include/freebsd/netinet/ip_encap.h
similarity index 100%
rename from include_bsd/netinet/ip_encap.h
rename to include/freebsd/netinet/ip_encap.h
diff --git a/include_bsd/netinet/ip_fil.h b/include/freebsd/netinet/ip_fil.h
similarity index 100%
rename from include_bsd/netinet/ip_fil.h
rename to include/freebsd/netinet/ip_fil.h
diff --git a/include_bsd/netinet/ip_frag.h b/include/freebsd/netinet/ip_frag.h
similarity index 100%
rename from include_bsd/netinet/ip_frag.h
rename to include/freebsd/netinet/ip_frag.h
diff --git a/include_bsd/netinet/ip_fw.h b/include/freebsd/netinet/ip_fw.h
similarity index 100%
rename from include_bsd/netinet/ip_fw.h
rename to include/freebsd/netinet/ip_fw.h
diff --git a/include_bsd/netinet/ip_htable.h b/include/freebsd/netinet/ip_htable.h
similarity index 100%
rename from include_bsd/netinet/ip_htable.h
rename to include/freebsd/netinet/ip_htable.h
diff --git a/include_bsd/netinet/ip_icmp.h b/include/freebsd/netinet/ip_icmp.h
similarity index 100%
rename from include_bsd/netinet/ip_icmp.h
rename to include/freebsd/netinet/ip_icmp.h
diff --git a/include_bsd/netinet/ip_ipsec.h b/include/freebsd/netinet/ip_ipsec.h
similarity index 100%
rename from include_bsd/netinet/ip_ipsec.h
rename to include/freebsd/netinet/ip_ipsec.h
diff --git a/include_bsd/netinet/ip_lookup.h b/include/freebsd/netinet/ip_lookup.h
similarity index 100%
rename from include_bsd/netinet/ip_lookup.h
rename to include/freebsd/netinet/ip_lookup.h
diff --git a/include_bsd/netinet/ip_mroute.h b/include/freebsd/netinet/ip_mroute.h
similarity index 100%
rename from include_bsd/netinet/ip_mroute.h
rename to include/freebsd/netinet/ip_mroute.h
diff --git a/include_bsd/netinet/ip_nat.h b/include/freebsd/netinet/ip_nat.h
similarity index 100%
rename from include_bsd/netinet/ip_nat.h
rename to include/freebsd/netinet/ip_nat.h
diff --git a/include_bsd/netinet/ip_options.h b/include/freebsd/netinet/ip_options.h
similarity index 100%
rename from include_bsd/netinet/ip_options.h
rename to include/freebsd/netinet/ip_options.h
diff --git a/include_bsd/netinet/ip_pool.h b/include/freebsd/netinet/ip_pool.h
similarity index 100%
rename from include_bsd/netinet/ip_pool.h
rename to include/freebsd/netinet/ip_pool.h
diff --git a/include_bsd/netinet/ip_proxy.h b/include/freebsd/netinet/ip_proxy.h
similarity index 100%
rename from include_bsd/netinet/ip_proxy.h
rename to include/freebsd/netinet/ip_proxy.h
diff --git a/include_bsd/netinet/ip_rules.h b/include/freebsd/netinet/ip_rules.h
similarity index 100%
rename from include_bsd/netinet/ip_rules.h
rename to include/freebsd/netinet/ip_rules.h
diff --git a/include_bsd/netinet/ip_scan.h b/include/freebsd/netinet/ip_scan.h
similarity index 100%
rename from include_bsd/netinet/ip_scan.h
rename to include/freebsd/netinet/ip_scan.h
diff --git a/include_bsd/netinet/ip_state.h b/include/freebsd/netinet/ip_state.h
similarity index 100%
rename from include_bsd/netinet/ip_state.h
rename to include/freebsd/netinet/ip_state.h
diff --git a/include_bsd/netinet/ip_sync.h b/include/freebsd/netinet/ip_sync.h
similarity index 100%
rename from include_bsd/netinet/ip_sync.h
rename to include/freebsd/netinet/ip_sync.h
diff --git a/include_bsd/netinet/ip_var.h b/include/freebsd/netinet/ip_var.h
similarity index 100%
rename from include_bsd/netinet/ip_var.h
rename to include/freebsd/netinet/ip_var.h
diff --git a/include_bsd/netinet/ipf_rb.h b/include/freebsd/netinet/ipf_rb.h
similarity index 100%
rename from include_bsd/netinet/ipf_rb.h
rename to include/freebsd/netinet/ipf_rb.h
diff --git a/include_bsd/netinet/ipl.h b/include/freebsd/netinet/ipl.h
similarity index 100%
rename from include_bsd/netinet/ipl.h
rename to include/freebsd/netinet/ipl.h
diff --git a/include_bsd/netinet/pim.h b/include/freebsd/netinet/pim.h
similarity index 100%
rename from include_bsd/netinet/pim.h
rename to include/freebsd/netinet/pim.h
diff --git a/include_bsd/netinet/pim_var.h b/include/freebsd/netinet/pim_var.h
similarity index 100%
rename from include_bsd/netinet/pim_var.h
rename to include/freebsd/netinet/pim_var.h
diff --git a/include_bsd/netinet/radix_ipf.h b/include/freebsd/netinet/radix_ipf.h
similarity index 100%
rename from include_bsd/netinet/radix_ipf.h
rename to include/freebsd/netinet/radix_ipf.h
diff --git a/include_bsd/netinet/sctp.h b/include/freebsd/netinet/sctp.h
similarity index 100%
rename from include_bsd/netinet/sctp.h
rename to include/freebsd/netinet/sctp.h
diff --git a/include_bsd/netinet/sctp_asconf.h b/include/freebsd/netinet/sctp_asconf.h
similarity index 100%
rename from include_bsd/netinet/sctp_asconf.h
rename to include/freebsd/netinet/sctp_asconf.h
diff --git a/include_bsd/netinet/sctp_auth.h b/include/freebsd/netinet/sctp_auth.h
similarity index 100%
rename from include_bsd/netinet/sctp_auth.h
rename to include/freebsd/netinet/sctp_auth.h
diff --git a/include_bsd/netinet/sctp_bsd_addr.h b/include/freebsd/netinet/sctp_bsd_addr.h
similarity index 100%
rename from include_bsd/netinet/sctp_bsd_addr.h
rename to include/freebsd/netinet/sctp_bsd_addr.h
diff --git a/include_bsd/netinet/sctp_constants.h b/include/freebsd/netinet/sctp_constants.h
similarity index 100%
rename from include_bsd/netinet/sctp_constants.h
rename to include/freebsd/netinet/sctp_constants.h
diff --git a/include_bsd/netinet/sctp_crc32.h b/include/freebsd/netinet/sctp_crc32.h
similarity index 100%
rename from include_bsd/netinet/sctp_crc32.h
rename to include/freebsd/netinet/sctp_crc32.h
diff --git a/include_bsd/netinet/sctp_dtrace_declare.h b/include/freebsd/netinet/sctp_dtrace_declare.h
similarity index 100%
rename from include_bsd/netinet/sctp_dtrace_declare.h
rename to include/freebsd/netinet/sctp_dtrace_declare.h
diff --git a/include_bsd/netinet/sctp_dtrace_define.h b/include/freebsd/netinet/sctp_dtrace_define.h
similarity index 100%
rename from include_bsd/netinet/sctp_dtrace_define.h
rename to include/freebsd/netinet/sctp_dtrace_define.h
diff --git a/include_bsd/netinet/sctp_header.h b/include/freebsd/netinet/sctp_header.h
similarity index 100%
rename from include_bsd/netinet/sctp_header.h
rename to include/freebsd/netinet/sctp_header.h
diff --git a/include_bsd/netinet/sctp_indata.h b/include/freebsd/netinet/sctp_indata.h
similarity index 100%
rename from include_bsd/netinet/sctp_indata.h
rename to include/freebsd/netinet/sctp_indata.h
diff --git a/include_bsd/netinet/sctp_input.h b/include/freebsd/netinet/sctp_input.h
similarity index 100%
rename from include_bsd/netinet/sctp_input.h
rename to include/freebsd/netinet/sctp_input.h
diff --git a/include_bsd/netinet/sctp_lock_bsd.h b/include/freebsd/netinet/sctp_lock_bsd.h
similarity index 100%
rename from include_bsd/netinet/sctp_lock_bsd.h
rename to include/freebsd/netinet/sctp_lock_bsd.h
diff --git a/include_bsd/netinet/sctp_os.h b/include/freebsd/netinet/sctp_os.h
similarity index 100%
rename from include_bsd/netinet/sctp_os.h
rename to include/freebsd/netinet/sctp_os.h
diff --git a/include_bsd/netinet/sctp_os_bsd.h b/include/freebsd/netinet/sctp_os_bsd.h
similarity index 100%
rename from include_bsd/netinet/sctp_os_bsd.h
rename to include/freebsd/netinet/sctp_os_bsd.h
diff --git a/include_bsd/netinet/sctp_output.h b/include/freebsd/netinet/sctp_output.h
similarity index 100%
rename from include_bsd/netinet/sctp_output.h
rename to include/freebsd/netinet/sctp_output.h
diff --git a/include_bsd/netinet/sctp_pcb.h b/include/freebsd/netinet/sctp_pcb.h
similarity index 100%
rename from include_bsd/netinet/sctp_pcb.h
rename to include/freebsd/netinet/sctp_pcb.h
diff --git a/include_bsd/netinet/sctp_peeloff.h b/include/freebsd/netinet/sctp_peeloff.h
similarity index 100%
rename from include_bsd/netinet/sctp_peeloff.h
rename to include/freebsd/netinet/sctp_peeloff.h
diff --git a/include_bsd/netinet/sctp_structs.h b/include/freebsd/netinet/sctp_structs.h
similarity index 100%
rename from include_bsd/netinet/sctp_structs.h
rename to include/freebsd/netinet/sctp_structs.h
diff --git a/include_bsd/netinet/sctp_sysctl.h b/include/freebsd/netinet/sctp_sysctl.h
similarity index 100%
rename from include_bsd/netinet/sctp_sysctl.h
rename to include/freebsd/netinet/sctp_sysctl.h
diff --git a/include_bsd/netinet/sctp_timer.h b/include/freebsd/netinet/sctp_timer.h
similarity index 100%
rename from include_bsd/netinet/sctp_timer.h
rename to include/freebsd/netinet/sctp_timer.h
diff --git a/include_bsd/netinet/sctp_uio.h b/include/freebsd/netinet/sctp_uio.h
similarity index 100%
rename from include_bsd/netinet/sctp_uio.h
rename to include/freebsd/netinet/sctp_uio.h
diff --git a/include_bsd/netinet/sctp_var.h b/include/freebsd/netinet/sctp_var.h
similarity index 100%
rename from include_bsd/netinet/sctp_var.h
rename to include/freebsd/netinet/sctp_var.h
diff --git a/include_bsd/netinet/sctputil.h b/include/freebsd/netinet/sctputil.h
similarity index 100%
rename from include_bsd/netinet/sctputil.h
rename to include/freebsd/netinet/sctputil.h
diff --git a/include_bsd/netinet/tcp.h b/include/freebsd/netinet/tcp.h
similarity index 100%
rename from include_bsd/netinet/tcp.h
rename to include/freebsd/netinet/tcp.h
diff --git a/include_bsd/netinet/tcp_debug.h b/include/freebsd/netinet/tcp_debug.h
similarity index 100%
rename from include_bsd/netinet/tcp_debug.h
rename to include/freebsd/netinet/tcp_debug.h
diff --git a/include_bsd/netinet/tcp_fastopen.h b/include/freebsd/netinet/tcp_fastopen.h
similarity index 100%
rename from include_bsd/netinet/tcp_fastopen.h
rename to include/freebsd/netinet/tcp_fastopen.h
diff --git a/include_bsd/netinet/tcp_fsm.h b/include/freebsd/netinet/tcp_fsm.h
similarity index 100%
rename from include_bsd/netinet/tcp_fsm.h
rename to include/freebsd/netinet/tcp_fsm.h
diff --git a/include_bsd/netinet/tcp_hostcache.h b/include/freebsd/netinet/tcp_hostcache.h
similarity index 100%
rename from include_bsd/netinet/tcp_hostcache.h
rename to include/freebsd/netinet/tcp_hostcache.h
diff --git a/include_bsd/netinet/tcp_lro.h b/include/freebsd/netinet/tcp_lro.h
similarity index 100%
rename from include_bsd/netinet/tcp_lro.h
rename to include/freebsd/netinet/tcp_lro.h
diff --git a/include_bsd/netinet/tcp_offload.h b/include/freebsd/netinet/tcp_offload.h
similarity index 100%
rename from include_bsd/netinet/tcp_offload.h
rename to include/freebsd/netinet/tcp_offload.h
diff --git a/include_bsd/netinet/tcp_pcap.h b/include/freebsd/netinet/tcp_pcap.h
similarity index 100%
rename from include_bsd/netinet/tcp_pcap.h
rename to include/freebsd/netinet/tcp_pcap.h
diff --git a/include_bsd/netinet/tcp_seq.h b/include/freebsd/netinet/tcp_seq.h
similarity index 100%
rename from include_bsd/netinet/tcp_seq.h
rename to include/freebsd/netinet/tcp_seq.h
diff --git a/include_bsd/netinet/tcp_syncache.h b/include/freebsd/netinet/tcp_syncache.h
similarity index 100%
rename from include_bsd/netinet/tcp_syncache.h
rename to include/freebsd/netinet/tcp_syncache.h
diff --git a/include_bsd/netinet/tcp_timer.h b/include/freebsd/netinet/tcp_timer.h
similarity index 100%
rename from include_bsd/netinet/tcp_timer.h
rename to include/freebsd/netinet/tcp_timer.h
diff --git a/include_bsd/netinet/tcp_var.h b/include/freebsd/netinet/tcp_var.h
similarity index 100%
rename from include_bsd/netinet/tcp_var.h
rename to include/freebsd/netinet/tcp_var.h
diff --git a/include_bsd/netinet/tcpip.h b/include/freebsd/netinet/tcpip.h
similarity index 100%
rename from include_bsd/netinet/tcpip.h
rename to include/freebsd/netinet/tcpip.h
diff --git a/include_bsd/netinet/toecore.h b/include/freebsd/netinet/toecore.h
similarity index 100%
rename from include_bsd/netinet/toecore.h
rename to include/freebsd/netinet/toecore.h
diff --git a/include_bsd/netinet/udp.h b/include/freebsd/netinet/udp.h
similarity index 100%
rename from include_bsd/netinet/udp.h
rename to include/freebsd/netinet/udp.h
diff --git a/include_bsd/netinet/udp_var.h b/include/freebsd/netinet/udp_var.h
similarity index 100%
rename from include_bsd/netinet/udp_var.h
rename to include/freebsd/netinet/udp_var.h
diff --git a/include_bsd/netinet/udplite.h b/include/freebsd/netinet/udplite.h
similarity index 100%
rename from include_bsd/netinet/udplite.h
rename to include/freebsd/netinet/udplite.h
diff --git a/include_bsd/netinet6/icmp6.h b/include/freebsd/netinet6/icmp6.h
similarity index 100%
rename from include_bsd/netinet6/icmp6.h
rename to include/freebsd/netinet6/icmp6.h
diff --git a/include_bsd/netinet6/in6.h b/include/freebsd/netinet6/in6.h
similarity index 100%
rename from include_bsd/netinet6/in6.h
rename to include/freebsd/netinet6/in6.h
diff --git a/include_bsd/netinet6/in6_fib.h b/include/freebsd/netinet6/in6_fib.h
similarity index 100%
rename from include_bsd/netinet6/in6_fib.h
rename to include/freebsd/netinet6/in6_fib.h
diff --git a/include_bsd/netinet6/in6_ifattach.h b/include/freebsd/netinet6/in6_ifattach.h
similarity index 100%
rename from include_bsd/netinet6/in6_ifattach.h
rename to include/freebsd/netinet6/in6_ifattach.h
diff --git a/include_bsd/netinet6/in6_pcb.h b/include/freebsd/netinet6/in6_pcb.h
similarity index 100%
rename from include_bsd/netinet6/in6_pcb.h
rename to include/freebsd/netinet6/in6_pcb.h
diff --git a/include_bsd/netinet6/in6_rss.h b/include/freebsd/netinet6/in6_rss.h
similarity index 100%
rename from include_bsd/netinet6/in6_rss.h
rename to include/freebsd/netinet6/in6_rss.h
diff --git a/include_bsd/netinet6/in6_var.h b/include/freebsd/netinet6/in6_var.h
similarity index 100%
rename from include_bsd/netinet6/in6_var.h
rename to include/freebsd/netinet6/in6_var.h
diff --git a/include_bsd/netinet6/ip6.h b/include/freebsd/netinet6/ip6.h
similarity index 100%
rename from include_bsd/netinet6/ip6.h
rename to include/freebsd/netinet6/ip6.h
diff --git a/include_bsd/netinet6/ip6_ecn.h b/include/freebsd/netinet6/ip6_ecn.h
similarity index 100%
rename from include_bsd/netinet6/ip6_ecn.h
rename to include/freebsd/netinet6/ip6_ecn.h
diff --git a/include_bsd/netinet6/ip6_ipsec.h b/include/freebsd/netinet6/ip6_ipsec.h
similarity index 100%
rename from include_bsd/netinet6/ip6_ipsec.h
rename to include/freebsd/netinet6/ip6_ipsec.h
diff --git a/include_bsd/netinet6/ip6_mroute.h b/include/freebsd/netinet6/ip6_mroute.h
similarity index 100%
rename from include_bsd/netinet6/ip6_mroute.h
rename to include/freebsd/netinet6/ip6_mroute.h
diff --git a/include_bsd/netinet6/ip6_var.h b/include/freebsd/netinet6/ip6_var.h
similarity index 100%
rename from include_bsd/netinet6/ip6_var.h
rename to include/freebsd/netinet6/ip6_var.h
diff --git a/include_bsd/netinet6/ip6protosw.h b/include/freebsd/netinet6/ip6protosw.h
similarity index 100%
rename from include_bsd/netinet6/ip6protosw.h
rename to include/freebsd/netinet6/ip6protosw.h
diff --git a/include_bsd/netinet6/mld6.h b/include/freebsd/netinet6/mld6.h
similarity index 100%
rename from include_bsd/netinet6/mld6.h
rename to include/freebsd/netinet6/mld6.h
diff --git a/include_bsd/netinet6/mld6_var.h b/include/freebsd/netinet6/mld6_var.h
similarity index 100%
rename from include_bsd/netinet6/mld6_var.h
rename to include/freebsd/netinet6/mld6_var.h
diff --git a/include_bsd/netinet6/nd6.h b/include/freebsd/netinet6/nd6.h
similarity index 100%
rename from include_bsd/netinet6/nd6.h
rename to include/freebsd/netinet6/nd6.h
diff --git a/include_bsd/netinet6/pim6.h b/include/freebsd/netinet6/pim6.h
similarity index 100%
rename from include_bsd/netinet6/pim6.h
rename to include/freebsd/netinet6/pim6.h
diff --git a/include_bsd/netinet6/pim6_var.h b/include/freebsd/netinet6/pim6_var.h
similarity index 100%
rename from include_bsd/netinet6/pim6_var.h
rename to include/freebsd/netinet6/pim6_var.h
diff --git a/include_bsd/netinet6/raw_ip6.h b/include/freebsd/netinet6/raw_ip6.h
similarity index 100%
rename from include_bsd/netinet6/raw_ip6.h
rename to include/freebsd/netinet6/raw_ip6.h
diff --git a/include_bsd/netinet6/scope6_var.h b/include/freebsd/netinet6/scope6_var.h
similarity index 100%
rename from include_bsd/netinet6/scope6_var.h
rename to include/freebsd/netinet6/scope6_var.h
diff --git a/include_bsd/netinet6/sctp6_var.h b/include/freebsd/netinet6/sctp6_var.h
similarity index 100%
rename from include_bsd/netinet6/sctp6_var.h
rename to include/freebsd/netinet6/sctp6_var.h
diff --git a/include_bsd/netinet6/send.h b/include/freebsd/netinet6/send.h
similarity index 100%
rename from include_bsd/netinet6/send.h
rename to include/freebsd/netinet6/send.h
diff --git a/include_bsd/netinet6/tcp6_var.h b/include/freebsd/netinet6/tcp6_var.h
similarity index 100%
rename from include_bsd/netinet6/tcp6_var.h
rename to include/freebsd/netinet6/tcp6_var.h
diff --git a/include_bsd/netinet6/udp6_var.h b/include/freebsd/netinet6/udp6_var.h
similarity index 100%
rename from include_bsd/netinet6/udp6_var.h
rename to include/freebsd/netinet6/udp6_var.h
diff --git a/include_bsd/netipsec/ah.h b/include/freebsd/netipsec/ah.h
similarity index 100%
rename from include_bsd/netipsec/ah.h
rename to include/freebsd/netipsec/ah.h
diff --git a/include_bsd/netipsec/ah_var.h b/include/freebsd/netipsec/ah_var.h
similarity index 100%
rename from include_bsd/netipsec/ah_var.h
rename to include/freebsd/netipsec/ah_var.h
diff --git a/include_bsd/netipsec/esp.h b/include/freebsd/netipsec/esp.h
similarity index 100%
rename from include_bsd/netipsec/esp.h
rename to include/freebsd/netipsec/esp.h
diff --git a/include_bsd/netipsec/esp_var.h b/include/freebsd/netipsec/esp_var.h
similarity index 100%
rename from include_bsd/netipsec/esp_var.h
rename to include/freebsd/netipsec/esp_var.h
diff --git a/include_bsd/netipsec/ipcomp.h b/include/freebsd/netipsec/ipcomp.h
similarity index 100%
rename from include_bsd/netipsec/ipcomp.h
rename to include/freebsd/netipsec/ipcomp.h
diff --git a/include_bsd/netipsec/ipcomp_var.h b/include/freebsd/netipsec/ipcomp_var.h
similarity index 100%
rename from include_bsd/netipsec/ipcomp_var.h
rename to include/freebsd/netipsec/ipcomp_var.h
diff --git a/include_bsd/netipsec/ipsec.h b/include/freebsd/netipsec/ipsec.h
similarity index 100%
rename from include_bsd/netipsec/ipsec.h
rename to include/freebsd/netipsec/ipsec.h
diff --git a/include_bsd/netipsec/ipsec6.h b/include/freebsd/netipsec/ipsec6.h
similarity index 100%
rename from include_bsd/netipsec/ipsec6.h
rename to include/freebsd/netipsec/ipsec6.h
diff --git a/include_bsd/netipsec/key.h b/include/freebsd/netipsec/key.h
similarity index 100%
rename from include_bsd/netipsec/key.h
rename to include/freebsd/netipsec/key.h
diff --git a/include_bsd/netipsec/key_debug.h b/include/freebsd/netipsec/key_debug.h
similarity index 100%
rename from include_bsd/netipsec/key_debug.h
rename to include/freebsd/netipsec/key_debug.h
diff --git a/include_bsd/netipsec/key_var.h b/include/freebsd/netipsec/key_var.h
similarity index 100%
rename from include_bsd/netipsec/key_var.h
rename to include/freebsd/netipsec/key_var.h
diff --git a/include_bsd/netipsec/keydb.h b/include/freebsd/netipsec/keydb.h
similarity index 100%
rename from include_bsd/netipsec/keydb.h
rename to include/freebsd/netipsec/keydb.h
diff --git a/include_bsd/netipsec/keysock.h b/include/freebsd/netipsec/keysock.h
similarity index 100%
rename from include_bsd/netipsec/keysock.h
rename to include/freebsd/netipsec/keysock.h
diff --git a/include_bsd/netipsec/xform.h b/include/freebsd/netipsec/xform.h
similarity index 100%
rename from include_bsd/netipsec/xform.h
rename to include/freebsd/netipsec/xform.h
diff --git a/include_bsd/netnatm/addr.h b/include/freebsd/netnatm/addr.h
similarity index 100%
rename from include_bsd/netnatm/addr.h
rename to include/freebsd/netnatm/addr.h
diff --git a/include_bsd/netnatm/api/atmapi.h b/include/freebsd/netnatm/api/atmapi.h
similarity index 100%
rename from include_bsd/netnatm/api/atmapi.h
rename to include/freebsd/netnatm/api/atmapi.h
diff --git a/include_bsd/netnatm/api/ccatm.h b/include/freebsd/netnatm/api/ccatm.h
similarity index 100%
rename from include_bsd/netnatm/api/ccatm.h
rename to include/freebsd/netnatm/api/ccatm.h
diff --git a/include_bsd/netnatm/api/unisap.h b/include/freebsd/netnatm/api/unisap.h
similarity index 100%
rename from include_bsd/netnatm/api/unisap.h
rename to include/freebsd/netnatm/api/unisap.h
diff --git a/include_bsd/netnatm/msg/uni_config.h b/include/freebsd/netnatm/msg/uni_config.h
similarity index 100%
rename from include_bsd/netnatm/msg/uni_config.h
rename to include/freebsd/netnatm/msg/uni_config.h
diff --git a/include_bsd/netnatm/msg/uni_hdr.h b/include/freebsd/netnatm/msg/uni_hdr.h
similarity index 100%
rename from include_bsd/netnatm/msg/uni_hdr.h
rename to include/freebsd/netnatm/msg/uni_hdr.h
diff --git a/include_bsd/netnatm/msg/uni_ie.h b/include/freebsd/netnatm/msg/uni_ie.h
similarity index 100%
rename from include_bsd/netnatm/msg/uni_ie.h
rename to include/freebsd/netnatm/msg/uni_ie.h
diff --git a/include_bsd/netnatm/msg/uni_msg.h b/include/freebsd/netnatm/msg/uni_msg.h
similarity index 100%
rename from include_bsd/netnatm/msg/uni_msg.h
rename to include/freebsd/netnatm/msg/uni_msg.h
diff --git a/include_bsd/netnatm/msg/unimsglib.h b/include/freebsd/netnatm/msg/unimsglib.h
similarity index 100%
rename from include_bsd/netnatm/msg/unimsglib.h
rename to include/freebsd/netnatm/msg/unimsglib.h
diff --git a/include_bsd/netnatm/msg/uniprint.h b/include/freebsd/netnatm/msg/uniprint.h
similarity index 100%
rename from include_bsd/netnatm/msg/uniprint.h
rename to include/freebsd/netnatm/msg/uniprint.h
diff --git a/include_bsd/netnatm/msg/unistruct.h b/include/freebsd/netnatm/msg/unistruct.h
similarity index 100%
rename from include_bsd/netnatm/msg/unistruct.h
rename to include/freebsd/netnatm/msg/unistruct.h
diff --git a/include_bsd/netnatm/natm.h b/include/freebsd/netnatm/natm.h
similarity index 100%
rename from include_bsd/netnatm/natm.h
rename to include/freebsd/netnatm/natm.h
diff --git a/include_bsd/netnatm/saal/sscfu.h b/include/freebsd/netnatm/saal/sscfu.h
similarity index 100%
rename from include_bsd/netnatm/saal/sscfu.h
rename to include/freebsd/netnatm/saal/sscfu.h
diff --git a/include_bsd/netnatm/saal/sscfudef.h b/include/freebsd/netnatm/saal/sscfudef.h
similarity index 100%
rename from include_bsd/netnatm/saal/sscfudef.h
rename to include/freebsd/netnatm/saal/sscfudef.h
diff --git a/include_bsd/netnatm/saal/sscop.h b/include/freebsd/netnatm/saal/sscop.h
similarity index 100%
rename from include_bsd/netnatm/saal/sscop.h
rename to include/freebsd/netnatm/saal/sscop.h
diff --git a/include_bsd/netnatm/saal/sscopdef.h b/include/freebsd/netnatm/saal/sscopdef.h
similarity index 100%
rename from include_bsd/netnatm/saal/sscopdef.h
rename to include/freebsd/netnatm/saal/sscopdef.h
diff --git a/include_bsd/netnatm/sig/uni.h b/include/freebsd/netnatm/sig/uni.h
similarity index 100%
rename from include_bsd/netnatm/sig/uni.h
rename to include/freebsd/netnatm/sig/uni.h
diff --git a/include_bsd/netnatm/sig/unidef.h b/include/freebsd/netnatm/sig/unidef.h
similarity index 100%
rename from include_bsd/netnatm/sig/unidef.h
rename to include/freebsd/netnatm/sig/unidef.h
diff --git a/include_bsd/netnatm/sig/unisig.h b/include/freebsd/netnatm/sig/unisig.h
similarity index 100%
rename from include_bsd/netnatm/sig/unisig.h
rename to include/freebsd/netnatm/sig/unisig.h
diff --git a/include_bsd/netnatm/unimsg.h b/include/freebsd/netnatm/unimsg.h
similarity index 100%
rename from include_bsd/netnatm/unimsg.h
rename to include/freebsd/netnatm/unimsg.h
diff --git a/include_bsd/netpfil/pf/pf.h b/include/freebsd/netpfil/pf/pf.h
similarity index 100%
rename from include_bsd/netpfil/pf/pf.h
rename to include/freebsd/netpfil/pf/pf.h
diff --git a/include_bsd/netpfil/pf/pf_altq.h b/include/freebsd/netpfil/pf/pf_altq.h
similarity index 100%
rename from include_bsd/netpfil/pf/pf_altq.h
rename to include/freebsd/netpfil/pf/pf_altq.h
diff --git a/include_bsd/netpfil/pf/pf_mtag.h b/include/freebsd/netpfil/pf/pf_mtag.h
similarity index 100%
rename from include_bsd/netpfil/pf/pf_mtag.h
rename to include/freebsd/netpfil/pf/pf_mtag.h
diff --git a/include_bsd/netsmb/netbios.h b/include/freebsd/netsmb/netbios.h
similarity index 100%
rename from include_bsd/netsmb/netbios.h
rename to include/freebsd/netsmb/netbios.h
diff --git a/include_bsd/netsmb/smb.h b/include/freebsd/netsmb/smb.h
similarity index 100%
rename from include_bsd/netsmb/smb.h
rename to include/freebsd/netsmb/smb.h
diff --git a/include_bsd/netsmb/smb_conn.h b/include/freebsd/netsmb/smb_conn.h
similarity index 100%
rename from include_bsd/netsmb/smb_conn.h
rename to include/freebsd/netsmb/smb_conn.h
diff --git a/include_bsd/netsmb/smb_dev.h b/include/freebsd/netsmb/smb_dev.h
similarity index 100%
rename from include_bsd/netsmb/smb_dev.h
rename to include/freebsd/netsmb/smb_dev.h
diff --git a/include_bsd/netsmb/smb_rq.h b/include/freebsd/netsmb/smb_rq.h
similarity index 100%
rename from include_bsd/netsmb/smb_rq.h
rename to include/freebsd/netsmb/smb_rq.h
diff --git a/include_bsd/netsmb/smb_subr.h b/include/freebsd/netsmb/smb_subr.h
similarity index 100%
rename from include_bsd/netsmb/smb_subr.h
rename to include/freebsd/netsmb/smb_subr.h
diff --git a/include_bsd/netsmb/smb_tran.h b/include/freebsd/netsmb/smb_tran.h
similarity index 100%
rename from include_bsd/netsmb/smb_tran.h
rename to include/freebsd/netsmb/smb_tran.h
diff --git a/include_bsd/netsmb/smb_trantcp.h b/include/freebsd/netsmb/smb_trantcp.h
similarity index 100%
rename from include_bsd/netsmb/smb_trantcp.h
rename to include/freebsd/netsmb/smb_trantcp.h
diff --git a/include_bsd/nfs/krpc.h b/include/freebsd/nfs/krpc.h
similarity index 100%
rename from include_bsd/nfs/krpc.h
rename to include/freebsd/nfs/krpc.h
diff --git a/include_bsd/nfs/nfs_common.h b/include/freebsd/nfs/nfs_common.h
similarity index 100%
rename from include_bsd/nfs/nfs_common.h
rename to include/freebsd/nfs/nfs_common.h
diff --git a/include_bsd/nfs/nfs_fha.h b/include/freebsd/nfs/nfs_fha.h
similarity index 100%
rename from include_bsd/nfs/nfs_fha.h
rename to include/freebsd/nfs/nfs_fha.h
diff --git a/include_bsd/nfs/nfs_kdtrace.h b/include/freebsd/nfs/nfs_kdtrace.h
similarity index 100%
rename from include_bsd/nfs/nfs_kdtrace.h
rename to include/freebsd/nfs/nfs_kdtrace.h
diff --git a/include_bsd/nfs/nfs_lock.h b/include/freebsd/nfs/nfs_lock.h
similarity index 100%
rename from include_bsd/nfs/nfs_lock.h
rename to include/freebsd/nfs/nfs_lock.h
diff --git a/include_bsd/nfs/nfs_mountcommon.h b/include/freebsd/nfs/nfs_mountcommon.h
similarity index 100%
rename from include_bsd/nfs/nfs_mountcommon.h
rename to include/freebsd/nfs/nfs_mountcommon.h
diff --git a/include_bsd/nfs/nfsdiskless.h b/include/freebsd/nfs/nfsdiskless.h
similarity index 100%
rename from include_bsd/nfs/nfsdiskless.h
rename to include/freebsd/nfs/nfsdiskless.h
diff --git a/include_bsd/nfs/nfsproto.h b/include/freebsd/nfs/nfsproto.h
similarity index 100%
rename from include_bsd/nfs/nfsproto.h
rename to include/freebsd/nfs/nfsproto.h
diff --git a/include_bsd/nfs/nfssvc.h b/include/freebsd/nfs/nfssvc.h
similarity index 100%
rename from include_bsd/nfs/nfssvc.h
rename to include/freebsd/nfs/nfssvc.h
diff --git a/include_bsd/nfs/xdr_subs.h b/include/freebsd/nfs/xdr_subs.h
similarity index 100%
rename from include_bsd/nfs/xdr_subs.h
rename to include/freebsd/nfs/xdr_subs.h
diff --git a/include_bsd/nfsclient/nfs.h b/include/freebsd/nfsclient/nfs.h
similarity index 100%
rename from include_bsd/nfsclient/nfs.h
rename to include/freebsd/nfsclient/nfs.h
diff --git a/include_bsd/nfsclient/nfsargs.h b/include/freebsd/nfsclient/nfsargs.h
similarity index 100%
rename from include_bsd/nfsclient/nfsargs.h
rename to include/freebsd/nfsclient/nfsargs.h
diff --git a/include_bsd/nfsclient/nfsm_subs.h b/include/freebsd/nfsclient/nfsm_subs.h
similarity index 100%
rename from include_bsd/nfsclient/nfsm_subs.h
rename to include/freebsd/nfsclient/nfsm_subs.h
diff --git a/include_bsd/nfsclient/nfsmount.h b/include/freebsd/nfsclient/nfsmount.h
similarity index 100%
rename from include_bsd/nfsclient/nfsmount.h
rename to include/freebsd/nfsclient/nfsmount.h
diff --git a/include_bsd/nfsclient/nfsnode.h b/include/freebsd/nfsclient/nfsnode.h
similarity index 100%
rename from include_bsd/nfsclient/nfsnode.h
rename to include/freebsd/nfsclient/nfsnode.h
diff --git a/include_bsd/nfsclient/nfsstats.h b/include/freebsd/nfsclient/nfsstats.h
similarity index 100%
rename from include_bsd/nfsclient/nfsstats.h
rename to include/freebsd/nfsclient/nfsstats.h
diff --git a/include_bsd/nfsclient/nlminfo.h b/include/freebsd/nfsclient/nlminfo.h
similarity index 100%
rename from include_bsd/nfsclient/nlminfo.h
rename to include/freebsd/nfsclient/nlminfo.h
diff --git a/include_bsd/nfsserver/nfs.h b/include/freebsd/nfsserver/nfs.h
similarity index 100%
rename from include_bsd/nfsserver/nfs.h
rename to include/freebsd/nfsserver/nfs.h
diff --git a/include_bsd/nfsserver/nfs_fha_old.h b/include/freebsd/nfsserver/nfs_fha_old.h
similarity index 100%
rename from include_bsd/nfsserver/nfs_fha_old.h
rename to include/freebsd/nfsserver/nfs_fha_old.h
diff --git a/include_bsd/nfsserver/nfsm_subs.h b/include/freebsd/nfsserver/nfsm_subs.h
similarity index 100%
rename from include_bsd/nfsserver/nfsm_subs.h
rename to include/freebsd/nfsserver/nfsm_subs.h
diff --git a/include_bsd/nfsserver/nfsrvcache.h b/include/freebsd/nfsserver/nfsrvcache.h
similarity index 100%
rename from include_bsd/nfsserver/nfsrvcache.h
rename to include/freebsd/nfsserver/nfsrvcache.h
diff --git a/include_bsd/nfsserver/nfsrvstats.h b/include/freebsd/nfsserver/nfsrvstats.h
similarity index 100%
rename from include_bsd/nfsserver/nfsrvstats.h
rename to include/freebsd/nfsserver/nfsrvstats.h
diff --git a/include_bsd/nl_types.h b/include/freebsd/nl_types.h
similarity index 100%
rename from include_bsd/nl_types.h
rename to include/freebsd/nl_types.h
diff --git a/include_bsd/nlist.h b/include/freebsd/nlist.h
similarity index 100%
rename from include_bsd/nlist.h
rename to include/freebsd/nlist.h
diff --git a/include_bsd/nss.h b/include/freebsd/nss.h
similarity index 100%
rename from include_bsd/nss.h
rename to include/freebsd/nss.h
diff --git a/include_bsd/nsswitch.h b/include/freebsd/nsswitch.h
similarity index 100%
rename from include_bsd/nsswitch.h
rename to include/freebsd/nsswitch.h
diff --git a/include_bsd/ntlm_err.h b/include/freebsd/ntlm_err.h
similarity index 100%
rename from include_bsd/ntlm_err.h
rename to include/freebsd/ntlm_err.h
diff --git a/include_bsd/ocsp_asn1.h b/include/freebsd/ocsp_asn1.h
similarity index 100%
rename from include_bsd/ocsp_asn1.h
rename to include/freebsd/ocsp_asn1.h
diff --git a/include_bsd/openssl/aes.h b/include/freebsd/openssl/aes.h
similarity index 100%
rename from include_bsd/openssl/aes.h
rename to include/freebsd/openssl/aes.h
diff --git a/include_bsd/openssl/asn1.h b/include/freebsd/openssl/asn1.h
similarity index 100%
rename from include_bsd/openssl/asn1.h
rename to include/freebsd/openssl/asn1.h
diff --git a/include_bsd/openssl/asn1_mac.h b/include/freebsd/openssl/asn1_mac.h
similarity index 100%
rename from include_bsd/openssl/asn1_mac.h
rename to include/freebsd/openssl/asn1_mac.h
diff --git a/include_bsd/openssl/asn1t.h b/include/freebsd/openssl/asn1t.h
similarity index 100%
rename from include_bsd/openssl/asn1t.h
rename to include/freebsd/openssl/asn1t.h
diff --git a/include_bsd/openssl/bio.h b/include/freebsd/openssl/bio.h
similarity index 100%
rename from include_bsd/openssl/bio.h
rename to include/freebsd/openssl/bio.h
diff --git a/include_bsd/openssl/blowfish.h b/include/freebsd/openssl/blowfish.h
similarity index 100%
rename from include_bsd/openssl/blowfish.h
rename to include/freebsd/openssl/blowfish.h
diff --git a/include_bsd/openssl/bn.h b/include/freebsd/openssl/bn.h
similarity index 100%
rename from include_bsd/openssl/bn.h
rename to include/freebsd/openssl/bn.h
diff --git a/include_bsd/openssl/buffer.h b/include/freebsd/openssl/buffer.h
similarity index 100%
rename from include_bsd/openssl/buffer.h
rename to include/freebsd/openssl/buffer.h
diff --git a/include_bsd/openssl/camellia.h b/include/freebsd/openssl/camellia.h
similarity index 100%
rename from include_bsd/openssl/camellia.h
rename to include/freebsd/openssl/camellia.h
diff --git a/include_bsd/openssl/cast.h b/include/freebsd/openssl/cast.h
similarity index 100%
rename from include_bsd/openssl/cast.h
rename to include/freebsd/openssl/cast.h
diff --git a/include_bsd/openssl/cmac.h b/include/freebsd/openssl/cmac.h
similarity index 100%
rename from include_bsd/openssl/cmac.h
rename to include/freebsd/openssl/cmac.h
diff --git a/include_bsd/openssl/cms.h b/include/freebsd/openssl/cms.h
similarity index 100%
rename from include_bsd/openssl/cms.h
rename to include/freebsd/openssl/cms.h
diff --git a/include_bsd/openssl/comp.h b/include/freebsd/openssl/comp.h
similarity index 100%
rename from include_bsd/openssl/comp.h
rename to include/freebsd/openssl/comp.h
diff --git a/include_bsd/openssl/conf.h b/include/freebsd/openssl/conf.h
similarity index 100%
rename from include_bsd/openssl/conf.h
rename to include/freebsd/openssl/conf.h
diff --git a/include_bsd/openssl/conf_api.h b/include/freebsd/openssl/conf_api.h
similarity index 100%
rename from include_bsd/openssl/conf_api.h
rename to include/freebsd/openssl/conf_api.h
diff --git a/include_bsd/openssl/crypto.h b/include/freebsd/openssl/crypto.h
similarity index 100%
rename from include_bsd/openssl/crypto.h
rename to include/freebsd/openssl/crypto.h
diff --git a/include_bsd/openssl/des.h b/include/freebsd/openssl/des.h
similarity index 100%
rename from include_bsd/openssl/des.h
rename to include/freebsd/openssl/des.h
diff --git a/include_bsd/openssl/des_old.h b/include/freebsd/openssl/des_old.h
similarity index 100%
rename from include_bsd/openssl/des_old.h
rename to include/freebsd/openssl/des_old.h
diff --git a/include_bsd/openssl/dh.h b/include/freebsd/openssl/dh.h
similarity index 100%
rename from include_bsd/openssl/dh.h
rename to include/freebsd/openssl/dh.h
diff --git a/include_bsd/openssl/dsa.h b/include/freebsd/openssl/dsa.h
similarity index 100%
rename from include_bsd/openssl/dsa.h
rename to include/freebsd/openssl/dsa.h
diff --git a/include_bsd/openssl/dso.h b/include/freebsd/openssl/dso.h
similarity index 100%
rename from include_bsd/openssl/dso.h
rename to include/freebsd/openssl/dso.h
diff --git a/include_bsd/openssl/dtls1.h b/include/freebsd/openssl/dtls1.h
similarity index 100%
rename from include_bsd/openssl/dtls1.h
rename to include/freebsd/openssl/dtls1.h
diff --git a/include_bsd/openssl/e_os2.h b/include/freebsd/openssl/e_os2.h
similarity index 100%
rename from include_bsd/openssl/e_os2.h
rename to include/freebsd/openssl/e_os2.h
diff --git a/include_bsd/openssl/ebcdic.h b/include/freebsd/openssl/ebcdic.h
similarity index 100%
rename from include_bsd/openssl/ebcdic.h
rename to include/freebsd/openssl/ebcdic.h
diff --git a/include_bsd/openssl/ec.h b/include/freebsd/openssl/ec.h
similarity index 100%
rename from include_bsd/openssl/ec.h
rename to include/freebsd/openssl/ec.h
diff --git a/include_bsd/openssl/ecdh.h b/include/freebsd/openssl/ecdh.h
similarity index 100%
rename from include_bsd/openssl/ecdh.h
rename to include/freebsd/openssl/ecdh.h
diff --git a/include_bsd/openssl/ecdsa.h b/include/freebsd/openssl/ecdsa.h
similarity index 100%
rename from include_bsd/openssl/ecdsa.h
rename to include/freebsd/openssl/ecdsa.h
diff --git a/include_bsd/openssl/engine.h b/include/freebsd/openssl/engine.h
similarity index 100%
rename from include_bsd/openssl/engine.h
rename to include/freebsd/openssl/engine.h
diff --git a/include_bsd/openssl/err.h b/include/freebsd/openssl/err.h
similarity index 100%
rename from include_bsd/openssl/err.h
rename to include/freebsd/openssl/err.h
diff --git a/include_bsd/openssl/evp.h b/include/freebsd/openssl/evp.h
similarity index 100%
rename from include_bsd/openssl/evp.h
rename to include/freebsd/openssl/evp.h
diff --git a/include_bsd/openssl/hmac.h b/include/freebsd/openssl/hmac.h
similarity index 100%
rename from include_bsd/openssl/hmac.h
rename to include/freebsd/openssl/hmac.h
diff --git a/include_bsd/openssl/idea.h b/include/freebsd/openssl/idea.h
similarity index 100%
rename from include_bsd/openssl/idea.h
rename to include/freebsd/openssl/idea.h
diff --git a/include_bsd/openssl/krb5_asn.h b/include/freebsd/openssl/krb5_asn.h
similarity index 100%
rename from include_bsd/openssl/krb5_asn.h
rename to include/freebsd/openssl/krb5_asn.h
diff --git a/include_bsd/openssl/kssl.h b/include/freebsd/openssl/kssl.h
similarity index 100%
rename from include_bsd/openssl/kssl.h
rename to include/freebsd/openssl/kssl.h
diff --git a/include_bsd/openssl/lhash.h b/include/freebsd/openssl/lhash.h
similarity index 100%
rename from include_bsd/openssl/lhash.h
rename to include/freebsd/openssl/lhash.h
diff --git a/include_bsd/openssl/md4.h b/include/freebsd/openssl/md4.h
similarity index 100%
rename from include_bsd/openssl/md4.h
rename to include/freebsd/openssl/md4.h
diff --git a/include_bsd/openssl/md5.h b/include/freebsd/openssl/md5.h
similarity index 100%
rename from include_bsd/openssl/md5.h
rename to include/freebsd/openssl/md5.h
diff --git a/include_bsd/openssl/mdc2.h b/include/freebsd/openssl/mdc2.h
similarity index 100%
rename from include_bsd/openssl/mdc2.h
rename to include/freebsd/openssl/mdc2.h
diff --git a/include_bsd/openssl/modes.h b/include/freebsd/openssl/modes.h
similarity index 100%
rename from include_bsd/openssl/modes.h
rename to include/freebsd/openssl/modes.h
diff --git a/include_bsd/openssl/obj_mac.h b/include/freebsd/openssl/obj_mac.h
similarity index 100%
rename from include_bsd/openssl/obj_mac.h
rename to include/freebsd/openssl/obj_mac.h
diff --git a/include_bsd/openssl/objects.h b/include/freebsd/openssl/objects.h
similarity index 100%
rename from include_bsd/openssl/objects.h
rename to include/freebsd/openssl/objects.h
diff --git a/include_bsd/openssl/ocsp.h b/include/freebsd/openssl/ocsp.h
similarity index 100%
rename from include_bsd/openssl/ocsp.h
rename to include/freebsd/openssl/ocsp.h
diff --git a/include_bsd/openssl/opensslconf.h b/include/freebsd/openssl/opensslconf.h
similarity index 100%
rename from include_bsd/openssl/opensslconf.h
rename to include/freebsd/openssl/opensslconf.h
diff --git a/include_bsd/openssl/opensslv.h b/include/freebsd/openssl/opensslv.h
similarity index 100%
rename from include_bsd/openssl/opensslv.h
rename to include/freebsd/openssl/opensslv.h
diff --git a/include_bsd/openssl/ossl_typ.h b/include/freebsd/openssl/ossl_typ.h
similarity index 100%
rename from include_bsd/openssl/ossl_typ.h
rename to include/freebsd/openssl/ossl_typ.h
diff --git a/include_bsd/openssl/pem.h b/include/freebsd/openssl/pem.h
similarity index 100%
rename from include_bsd/openssl/pem.h
rename to include/freebsd/openssl/pem.h
diff --git a/include_bsd/openssl/pem2.h b/include/freebsd/openssl/pem2.h
similarity index 100%
rename from include_bsd/openssl/pem2.h
rename to include/freebsd/openssl/pem2.h
diff --git a/include_bsd/openssl/pkcs12.h b/include/freebsd/openssl/pkcs12.h
similarity index 100%
rename from include_bsd/openssl/pkcs12.h
rename to include/freebsd/openssl/pkcs12.h
diff --git a/include_bsd/openssl/pkcs7.h b/include/freebsd/openssl/pkcs7.h
similarity index 100%
rename from include_bsd/openssl/pkcs7.h
rename to include/freebsd/openssl/pkcs7.h
diff --git a/include_bsd/openssl/pqueue.h b/include/freebsd/openssl/pqueue.h
similarity index 100%
rename from include_bsd/openssl/pqueue.h
rename to include/freebsd/openssl/pqueue.h
diff --git a/include_bsd/openssl/rand.h b/include/freebsd/openssl/rand.h
similarity index 100%
rename from include_bsd/openssl/rand.h
rename to include/freebsd/openssl/rand.h
diff --git a/include_bsd/openssl/rc2.h b/include/freebsd/openssl/rc2.h
similarity index 100%
rename from include_bsd/openssl/rc2.h
rename to include/freebsd/openssl/rc2.h
diff --git a/include_bsd/openssl/rc4.h b/include/freebsd/openssl/rc4.h
similarity index 100%
rename from include_bsd/openssl/rc4.h
rename to include/freebsd/openssl/rc4.h
diff --git a/include_bsd/openssl/rc5.h b/include/freebsd/openssl/rc5.h
similarity index 100%
rename from include_bsd/openssl/rc5.h
rename to include/freebsd/openssl/rc5.h
diff --git a/include_bsd/openssl/ripemd.h b/include/freebsd/openssl/ripemd.h
similarity index 100%
rename from include_bsd/openssl/ripemd.h
rename to include/freebsd/openssl/ripemd.h
diff --git a/include_bsd/openssl/rsa.h b/include/freebsd/openssl/rsa.h
similarity index 100%
rename from include_bsd/openssl/rsa.h
rename to include/freebsd/openssl/rsa.h
diff --git a/include_bsd/openssl/safestack.h b/include/freebsd/openssl/safestack.h
similarity index 100%
rename from include_bsd/openssl/safestack.h
rename to include/freebsd/openssl/safestack.h
diff --git a/include_bsd/openssl/seed.h b/include/freebsd/openssl/seed.h
similarity index 100%
rename from include_bsd/openssl/seed.h
rename to include/freebsd/openssl/seed.h
diff --git a/include_bsd/openssl/sha.h b/include/freebsd/openssl/sha.h
similarity index 100%
rename from include_bsd/openssl/sha.h
rename to include/freebsd/openssl/sha.h
diff --git a/include_bsd/openssl/srp.h b/include/freebsd/openssl/srp.h
similarity index 100%
rename from include_bsd/openssl/srp.h
rename to include/freebsd/openssl/srp.h
diff --git a/include_bsd/openssl/srtp.h b/include/freebsd/openssl/srtp.h
similarity index 100%
rename from include_bsd/openssl/srtp.h
rename to include/freebsd/openssl/srtp.h
diff --git a/include_bsd/openssl/ssl.h b/include/freebsd/openssl/ssl.h
similarity index 100%
rename from include_bsd/openssl/ssl.h
rename to include/freebsd/openssl/ssl.h
diff --git a/include_bsd/openssl/ssl2.h b/include/freebsd/openssl/ssl2.h
similarity index 100%
rename from include_bsd/openssl/ssl2.h
rename to include/freebsd/openssl/ssl2.h
diff --git a/include_bsd/openssl/ssl23.h b/include/freebsd/openssl/ssl23.h
similarity index 100%
rename from include_bsd/openssl/ssl23.h
rename to include/freebsd/openssl/ssl23.h
diff --git a/include_bsd/openssl/ssl3.h b/include/freebsd/openssl/ssl3.h
similarity index 100%
rename from include_bsd/openssl/ssl3.h
rename to include/freebsd/openssl/ssl3.h
diff --git a/include_bsd/openssl/stack.h b/include/freebsd/openssl/stack.h
similarity index 100%
rename from include_bsd/openssl/stack.h
rename to include/freebsd/openssl/stack.h
diff --git a/include_bsd/openssl/symhacks.h b/include/freebsd/openssl/symhacks.h
similarity index 100%
rename from include_bsd/openssl/symhacks.h
rename to include/freebsd/openssl/symhacks.h
diff --git a/include_bsd/openssl/tls1.h b/include/freebsd/openssl/tls1.h
similarity index 100%
rename from include_bsd/openssl/tls1.h
rename to include/freebsd/openssl/tls1.h
diff --git a/include_bsd/openssl/ts.h b/include/freebsd/openssl/ts.h
similarity index 100%
rename from include_bsd/openssl/ts.h
rename to include/freebsd/openssl/ts.h
diff --git a/include_bsd/openssl/txt_db.h b/include/freebsd/openssl/txt_db.h
similarity index 100%
rename from include_bsd/openssl/txt_db.h
rename to include/freebsd/openssl/txt_db.h
diff --git a/include_bsd/openssl/ui.h b/include/freebsd/openssl/ui.h
similarity index 100%
rename from include_bsd/openssl/ui.h
rename to include/freebsd/openssl/ui.h
diff --git a/include_bsd/openssl/ui_compat.h b/include/freebsd/openssl/ui_compat.h
similarity index 100%
rename from include_bsd/openssl/ui_compat.h
rename to include/freebsd/openssl/ui_compat.h
diff --git a/include_bsd/openssl/whrlpool.h b/include/freebsd/openssl/whrlpool.h
similarity index 100%
rename from include_bsd/openssl/whrlpool.h
rename to include/freebsd/openssl/whrlpool.h
diff --git a/include_bsd/openssl/x509.h b/include/freebsd/openssl/x509.h
similarity index 100%
rename from include_bsd/openssl/x509.h
rename to include/freebsd/openssl/x509.h
diff --git a/include_bsd/openssl/x509_vfy.h b/include/freebsd/openssl/x509_vfy.h
similarity index 100%
rename from include_bsd/openssl/x509_vfy.h
rename to include/freebsd/openssl/x509_vfy.h
diff --git a/include_bsd/openssl/x509v3.h b/include/freebsd/openssl/x509v3.h
similarity index 100%
rename from include_bsd/openssl/x509v3.h
rename to include/freebsd/openssl/x509v3.h
diff --git a/include_bsd/opie.h b/include/freebsd/opie.h
similarity index 100%
rename from include_bsd/opie.h
rename to include/freebsd/opie.h
diff --git a/include_bsd/osreldate.h b/include/freebsd/osreldate.h
similarity index 100%
rename from include_bsd/osreldate.h
rename to include/freebsd/osreldate.h
diff --git a/include_bsd/panel.h b/include/freebsd/panel.h
similarity index 100%
rename from include_bsd/panel.h
rename to include/freebsd/panel.h
diff --git a/include_bsd/parse_bytes.h b/include/freebsd/parse_bytes.h
similarity index 100%
rename from include_bsd/parse_bytes.h
rename to include/freebsd/parse_bytes.h
diff --git a/include_bsd/parse_time.h b/include/freebsd/parse_time.h
similarity index 100%
rename from include_bsd/parse_time.h
rename to include/freebsd/parse_time.h
diff --git a/include_bsd/parse_units.h b/include/freebsd/parse_units.h
similarity index 100%
rename from include_bsd/parse_units.h
rename to include/freebsd/parse_units.h
diff --git a/include_bsd/paths.h b/include/freebsd/paths.h
similarity index 100%
rename from include_bsd/paths.h
rename to include/freebsd/paths.h
diff --git a/include_bsd/pcap-bpf.h b/include/freebsd/pcap-bpf.h
similarity index 100%
rename from include_bsd/pcap-bpf.h
rename to include/freebsd/pcap-bpf.h
diff --git a/include_bsd/pcap-int.h b/include/freebsd/pcap-int.h
similarity index 100%
rename from include_bsd/pcap-int.h
rename to include/freebsd/pcap-int.h
diff --git a/include_bsd/pcap-namedb.h b/include/freebsd/pcap-namedb.h
similarity index 100%
rename from include_bsd/pcap-namedb.h
rename to include/freebsd/pcap-namedb.h
diff --git a/include_bsd/pcap.h b/include/freebsd/pcap.h
similarity index 100%
rename from include_bsd/pcap.h
rename to include/freebsd/pcap.h
diff --git a/include_bsd/pcap/bpf.h b/include/freebsd/pcap/bpf.h
similarity index 100%
rename from include_bsd/pcap/bpf.h
rename to include/freebsd/pcap/bpf.h
diff --git a/include_bsd/pcap/namedb.h b/include/freebsd/pcap/namedb.h
similarity index 100%
rename from include_bsd/pcap/namedb.h
rename to include/freebsd/pcap/namedb.h
diff --git a/include_bsd/pcap/pcap.h b/include/freebsd/pcap/pcap.h
similarity index 100%
rename from include_bsd/pcap/pcap.h
rename to include/freebsd/pcap/pcap.h
diff --git a/include_bsd/pkcs10_asn1.h b/include/freebsd/pkcs10_asn1.h
similarity index 100%
rename from include_bsd/pkcs10_asn1.h
rename to include/freebsd/pkcs10_asn1.h
diff --git a/include_bsd/pkcs12_asn1.h b/include/freebsd/pkcs12_asn1.h
similarity index 100%
rename from include_bsd/pkcs12_asn1.h
rename to include/freebsd/pkcs12_asn1.h
diff --git a/include_bsd/pkcs8_asn1.h b/include/freebsd/pkcs8_asn1.h
similarity index 100%
rename from include_bsd/pkcs8_asn1.h
rename to include/freebsd/pkcs8_asn1.h
diff --git a/include_bsd/pkcs9_asn1.h b/include/freebsd/pkcs9_asn1.h
similarity index 100%
rename from include_bsd/pkcs9_asn1.h
rename to include/freebsd/pkcs9_asn1.h
diff --git a/include_bsd/pkinit_asn1.h b/include/freebsd/pkinit_asn1.h
similarity index 100%
rename from include_bsd/pkinit_asn1.h
rename to include/freebsd/pkinit_asn1.h
diff --git a/include_bsd/pmc.h b/include/freebsd/pmc.h
similarity index 100%
rename from include_bsd/pmc.h
rename to include/freebsd/pmc.h
diff --git a/include_bsd/pmclog.h b/include/freebsd/pmclog.h
similarity index 100%
rename from include_bsd/pmclog.h
rename to include/freebsd/pmclog.h
diff --git a/include_bsd/poll.h b/include/freebsd/poll.h
similarity index 100%
rename from include_bsd/poll.h
rename to include/freebsd/poll.h
diff --git a/include_bsd/printf.h b/include/freebsd/printf.h
similarity index 100%
rename from include_bsd/printf.h
rename to include/freebsd/printf.h
diff --git a/include_bsd/private/bsdstat/bsdstat.h b/include/freebsd/private/bsdstat/bsdstat.h
similarity index 100%
rename from include_bsd/private/bsdstat/bsdstat.h
rename to include/freebsd/private/bsdstat/bsdstat.h
diff --git a/include_bsd/private/ucl/ucl.h b/include/freebsd/private/ucl/ucl.h
similarity index 100%
rename from include_bsd/private/ucl/ucl.h
rename to include/freebsd/private/ucl/ucl.h
diff --git a/include_bsd/proc_service.h b/include/freebsd/proc_service.h
similarity index 100%
rename from include_bsd/proc_service.h
rename to include/freebsd/proc_service.h
diff --git a/include_bsd/protocols/dumprestore.h b/include/freebsd/protocols/dumprestore.h
similarity index 100%
rename from include_bsd/protocols/dumprestore.h
rename to include/freebsd/protocols/dumprestore.h
diff --git a/include_bsd/protocols/routed.h b/include/freebsd/protocols/routed.h
similarity index 100%
rename from include_bsd/protocols/routed.h
rename to include/freebsd/protocols/routed.h
diff --git a/include_bsd/protocols/rwhod.h b/include/freebsd/protocols/rwhod.h
similarity index 100%
rename from include_bsd/protocols/rwhod.h
rename to include/freebsd/protocols/rwhod.h
diff --git a/include_bsd/protocols/talkd.h b/include/freebsd/protocols/talkd.h
similarity index 100%
rename from include_bsd/protocols/talkd.h
rename to include/freebsd/protocols/talkd.h
diff --git a/include_bsd/protocols/timed.h b/include/freebsd/protocols/timed.h
similarity index 100%
rename from include_bsd/protocols/timed.h
rename to include/freebsd/protocols/timed.h
diff --git a/include_bsd/pthread.h b/include/freebsd/pthread.h
similarity index 100%
rename from include_bsd/pthread.h
rename to include/freebsd/pthread.h
diff --git a/include_bsd/pthread_np.h b/include/freebsd/pthread_np.h
similarity index 100%
rename from include_bsd/pthread_np.h
rename to include/freebsd/pthread_np.h
diff --git a/include_bsd/pwd.h b/include/freebsd/pwd.h
similarity index 100%
rename from include_bsd/pwd.h
rename to include/freebsd/pwd.h
diff --git a/include_bsd/radlib.h b/include/freebsd/radlib.h
similarity index 100%
rename from include_bsd/radlib.h
rename to include/freebsd/radlib.h
diff --git a/include_bsd/radlib_vs.h b/include/freebsd/radlib_vs.h
similarity index 100%
rename from include_bsd/radlib_vs.h
rename to include/freebsd/radlib_vs.h
diff --git a/include_bsd/ranlib.h b/include/freebsd/ranlib.h
similarity index 100%
rename from include_bsd/ranlib.h
rename to include/freebsd/ranlib.h
diff --git a/include_bsd/readpassphrase.h b/include/freebsd/readpassphrase.h
similarity index 100%
rename from include_bsd/readpassphrase.h
rename to include/freebsd/readpassphrase.h
diff --git a/include_bsd/regex.h b/include/freebsd/regex.h
similarity index 100%
rename from include_bsd/regex.h
rename to include/freebsd/regex.h
diff --git a/include_bsd/res_update.h b/include/freebsd/res_update.h
similarity index 100%
rename from include_bsd/res_update.h
rename to include/freebsd/res_update.h
diff --git a/include_bsd/resolv.h b/include/freebsd/resolv.h
similarity index 100%
rename from include_bsd/resolv.h
rename to include/freebsd/resolv.h
diff --git a/include_bsd/resolve.h b/include/freebsd/resolve.h
similarity index 100%
rename from include_bsd/resolve.h
rename to include/freebsd/resolve.h
diff --git a/include_bsd/rfc2459_asn1.h b/include/freebsd/rfc2459_asn1.h
similarity index 100%
rename from include_bsd/rfc2459_asn1.h
rename to include/freebsd/rfc2459_asn1.h
diff --git a/include_bsd/ripemd.h b/include/freebsd/ripemd.h
similarity index 100%
rename from include_bsd/ripemd.h
rename to include/freebsd/ripemd.h
diff --git a/include_bsd/roken-common.h b/include/freebsd/roken-common.h
similarity index 100%
rename from include_bsd/roken-common.h
rename to include/freebsd/roken-common.h
diff --git a/include_bsd/roken.h b/include/freebsd/roken.h
similarity index 100%
rename from include_bsd/roken.h
rename to include/freebsd/roken.h
diff --git a/include_bsd/rpc/auth.h b/include/freebsd/rpc/auth.h
similarity index 100%
rename from include_bsd/rpc/auth.h
rename to include/freebsd/rpc/auth.h
diff --git a/include_bsd/rpc/auth_des.h b/include/freebsd/rpc/auth_des.h
similarity index 100%
rename from include_bsd/rpc/auth_des.h
rename to include/freebsd/rpc/auth_des.h
diff --git a/include_bsd/rpc/auth_kerb.h b/include/freebsd/rpc/auth_kerb.h
similarity index 100%
rename from include_bsd/rpc/auth_kerb.h
rename to include/freebsd/rpc/auth_kerb.h
diff --git a/include_bsd/rpc/auth_unix.h b/include/freebsd/rpc/auth_unix.h
similarity index 100%
rename from include_bsd/rpc/auth_unix.h
rename to include/freebsd/rpc/auth_unix.h
diff --git a/include_bsd/rpc/clnt.h b/include/freebsd/rpc/clnt.h
similarity index 100%
rename from include_bsd/rpc/clnt.h
rename to include/freebsd/rpc/clnt.h
diff --git a/include_bsd/rpc/clnt_soc.h b/include/freebsd/rpc/clnt_soc.h
similarity index 100%
rename from include_bsd/rpc/clnt_soc.h
rename to include/freebsd/rpc/clnt_soc.h
diff --git a/include_bsd/rpc/clnt_stat.h b/include/freebsd/rpc/clnt_stat.h
similarity index 100%
rename from include_bsd/rpc/clnt_stat.h
rename to include/freebsd/rpc/clnt_stat.h
diff --git a/include_bsd/rpc/des.h b/include/freebsd/rpc/des.h
similarity index 100%
rename from include_bsd/rpc/des.h
rename to include/freebsd/rpc/des.h
diff --git a/include_bsd/rpc/des_crypt.h b/include/freebsd/rpc/des_crypt.h
similarity index 100%
rename from include_bsd/rpc/des_crypt.h
rename to include/freebsd/rpc/des_crypt.h
diff --git a/include_bsd/rpc/key_prot.h b/include/freebsd/rpc/key_prot.h
similarity index 100%
rename from include_bsd/rpc/key_prot.h
rename to include/freebsd/rpc/key_prot.h
diff --git a/include_bsd/rpc/nettype.h b/include/freebsd/rpc/nettype.h
similarity index 100%
rename from include_bsd/rpc/nettype.h
rename to include/freebsd/rpc/nettype.h
diff --git a/include_bsd/rpc/pmap_clnt.h b/include/freebsd/rpc/pmap_clnt.h
similarity index 100%
rename from include_bsd/rpc/pmap_clnt.h
rename to include/freebsd/rpc/pmap_clnt.h
diff --git a/include_bsd/rpc/pmap_prot.h b/include/freebsd/rpc/pmap_prot.h
similarity index 100%
rename from include_bsd/rpc/pmap_prot.h
rename to include/freebsd/rpc/pmap_prot.h
diff --git a/include_bsd/rpc/pmap_rmt.h b/include/freebsd/rpc/pmap_rmt.h
similarity index 100%
rename from include_bsd/rpc/pmap_rmt.h
rename to include/freebsd/rpc/pmap_rmt.h
diff --git a/include_bsd/rpc/raw.h b/include/freebsd/rpc/raw.h
similarity index 100%
rename from include_bsd/rpc/raw.h
rename to include/freebsd/rpc/raw.h
diff --git a/include_bsd/rpc/rpc.h b/include/freebsd/rpc/rpc.h
similarity index 100%
rename from include_bsd/rpc/rpc.h
rename to include/freebsd/rpc/rpc.h
diff --git a/include_bsd/rpc/rpc_com.h b/include/freebsd/rpc/rpc_com.h
similarity index 100%
rename from include_bsd/rpc/rpc_com.h
rename to include/freebsd/rpc/rpc_com.h
diff --git a/include_bsd/rpc/rpc_msg.h b/include/freebsd/rpc/rpc_msg.h
similarity index 100%
rename from include_bsd/rpc/rpc_msg.h
rename to include/freebsd/rpc/rpc_msg.h
diff --git a/include_bsd/rpc/rpcb_clnt.h b/include/freebsd/rpc/rpcb_clnt.h
similarity index 100%
rename from include_bsd/rpc/rpcb_clnt.h
rename to include/freebsd/rpc/rpcb_clnt.h
diff --git a/include_bsd/rpc/rpcb_prot.h b/include/freebsd/rpc/rpcb_prot.h
similarity index 100%
rename from include_bsd/rpc/rpcb_prot.h
rename to include/freebsd/rpc/rpcb_prot.h
diff --git a/include_bsd/rpc/rpcb_prot.x b/include/freebsd/rpc/rpcb_prot.x
similarity index 100%
rename from include_bsd/rpc/rpcb_prot.x
rename to include/freebsd/rpc/rpcb_prot.x
diff --git a/include_bsd/rpc/rpcent.h b/include/freebsd/rpc/rpcent.h
similarity index 100%
rename from include_bsd/rpc/rpcent.h
rename to include/freebsd/rpc/rpcent.h
diff --git a/include_bsd/rpc/rpcsec_gss.h b/include/freebsd/rpc/rpcsec_gss.h
similarity index 100%
rename from include_bsd/rpc/rpcsec_gss.h
rename to include/freebsd/rpc/rpcsec_gss.h
diff --git a/include_bsd/rpc/svc.h b/include/freebsd/rpc/svc.h
similarity index 100%
rename from include_bsd/rpc/svc.h
rename to include/freebsd/rpc/svc.h
diff --git a/include_bsd/rpc/svc_auth.h b/include/freebsd/rpc/svc_auth.h
similarity index 100%
rename from include_bsd/rpc/svc_auth.h
rename to include/freebsd/rpc/svc_auth.h
diff --git a/include_bsd/rpc/svc_dg.h b/include/freebsd/rpc/svc_dg.h
similarity index 100%
rename from include_bsd/rpc/svc_dg.h
rename to include/freebsd/rpc/svc_dg.h
diff --git a/include_bsd/rpc/svc_soc.h b/include/freebsd/rpc/svc_soc.h
similarity index 100%
rename from include_bsd/rpc/svc_soc.h
rename to include/freebsd/rpc/svc_soc.h
diff --git a/include_bsd/rpc/types.h b/include/freebsd/rpc/types.h
similarity index 100%
rename from include_bsd/rpc/types.h
rename to include/freebsd/rpc/types.h
diff --git a/include_bsd/rpc/xdr.h b/include/freebsd/rpc/xdr.h
similarity index 100%
rename from include_bsd/rpc/xdr.h
rename to include/freebsd/rpc/xdr.h
diff --git a/include_bsd/rpcsvc/bootparam_prot.h b/include/freebsd/rpcsvc/bootparam_prot.h
similarity index 100%
rename from include_bsd/rpcsvc/bootparam_prot.h
rename to include/freebsd/rpcsvc/bootparam_prot.h
diff --git a/include_bsd/rpcsvc/bootparam_prot.x b/include/freebsd/rpcsvc/bootparam_prot.x
similarity index 100%
rename from include_bsd/rpcsvc/bootparam_prot.x
rename to include/freebsd/rpcsvc/bootparam_prot.x
diff --git a/include_bsd/rpcsvc/crypt.h b/include/freebsd/rpcsvc/crypt.h
similarity index 100%
rename from include_bsd/rpcsvc/crypt.h
rename to include/freebsd/rpcsvc/crypt.h
diff --git a/include_bsd/rpcsvc/crypt.x b/include/freebsd/rpcsvc/crypt.x
similarity index 100%
rename from include_bsd/rpcsvc/crypt.x
rename to include/freebsd/rpcsvc/crypt.x
diff --git a/include_bsd/rpcsvc/key_prot.h b/include/freebsd/rpcsvc/key_prot.h
similarity index 100%
rename from include_bsd/rpcsvc/key_prot.h
rename to include/freebsd/rpcsvc/key_prot.h
diff --git a/include_bsd/rpcsvc/key_prot.x b/include/freebsd/rpcsvc/key_prot.x
similarity index 100%
rename from include_bsd/rpcsvc/key_prot.x
rename to include/freebsd/rpcsvc/key_prot.x
diff --git a/include_bsd/rpcsvc/klm_prot.h b/include/freebsd/rpcsvc/klm_prot.h
similarity index 100%
rename from include_bsd/rpcsvc/klm_prot.h
rename to include/freebsd/rpcsvc/klm_prot.h
diff --git a/include_bsd/rpcsvc/klm_prot.x b/include/freebsd/rpcsvc/klm_prot.x
similarity index 100%
rename from include_bsd/rpcsvc/klm_prot.x
rename to include/freebsd/rpcsvc/klm_prot.x
diff --git a/include_bsd/rpcsvc/mount.h b/include/freebsd/rpcsvc/mount.h
similarity index 100%
rename from include_bsd/rpcsvc/mount.h
rename to include/freebsd/rpcsvc/mount.h
diff --git a/include_bsd/rpcsvc/mount.x b/include/freebsd/rpcsvc/mount.x
similarity index 100%
rename from include_bsd/rpcsvc/mount.x
rename to include/freebsd/rpcsvc/mount.x
diff --git a/include_bsd/rpcsvc/nfs_prot.h b/include/freebsd/rpcsvc/nfs_prot.h
similarity index 100%
rename from include_bsd/rpcsvc/nfs_prot.h
rename to include/freebsd/rpcsvc/nfs_prot.h
diff --git a/include_bsd/rpcsvc/nfs_prot.x b/include/freebsd/rpcsvc/nfs_prot.x
similarity index 100%
rename from include_bsd/rpcsvc/nfs_prot.x
rename to include/freebsd/rpcsvc/nfs_prot.x
diff --git a/include_bsd/rpcsvc/nis.h b/include/freebsd/rpcsvc/nis.h
similarity index 100%
rename from include_bsd/rpcsvc/nis.h
rename to include/freebsd/rpcsvc/nis.h
diff --git a/include_bsd/rpcsvc/nis.x b/include/freebsd/rpcsvc/nis.x
similarity index 100%
rename from include_bsd/rpcsvc/nis.x
rename to include/freebsd/rpcsvc/nis.x
diff --git a/include_bsd/rpcsvc/nis_cache.h b/include/freebsd/rpcsvc/nis_cache.h
similarity index 100%
rename from include_bsd/rpcsvc/nis_cache.h
rename to include/freebsd/rpcsvc/nis_cache.h
diff --git a/include_bsd/rpcsvc/nis_cache.x b/include/freebsd/rpcsvc/nis_cache.x
similarity index 100%
rename from include_bsd/rpcsvc/nis_cache.x
rename to include/freebsd/rpcsvc/nis_cache.x
diff --git a/include_bsd/rpcsvc/nis_callback.h b/include/freebsd/rpcsvc/nis_callback.h
similarity index 100%
rename from include_bsd/rpcsvc/nis_callback.h
rename to include/freebsd/rpcsvc/nis_callback.h
diff --git a/include_bsd/rpcsvc/nis_callback.x b/include/freebsd/rpcsvc/nis_callback.x
similarity index 100%
rename from include_bsd/rpcsvc/nis_callback.x
rename to include/freebsd/rpcsvc/nis_callback.x
diff --git a/include_bsd/rpcsvc/nis_db.h b/include/freebsd/rpcsvc/nis_db.h
similarity index 100%
rename from include_bsd/rpcsvc/nis_db.h
rename to include/freebsd/rpcsvc/nis_db.h
diff --git a/include_bsd/rpcsvc/nis_object.x b/include/freebsd/rpcsvc/nis_object.x
similarity index 100%
rename from include_bsd/rpcsvc/nis_object.x
rename to include/freebsd/rpcsvc/nis_object.x
diff --git a/include_bsd/rpcsvc/nis_tags.h b/include/freebsd/rpcsvc/nis_tags.h
similarity index 100%
rename from include_bsd/rpcsvc/nis_tags.h
rename to include/freebsd/rpcsvc/nis_tags.h
diff --git a/include_bsd/rpcsvc/nislib.h b/include/freebsd/rpcsvc/nislib.h
similarity index 100%
rename from include_bsd/rpcsvc/nislib.h
rename to include/freebsd/rpcsvc/nislib.h
diff --git a/include_bsd/rpcsvc/nlm_prot.h b/include/freebsd/rpcsvc/nlm_prot.h
similarity index 100%
rename from include_bsd/rpcsvc/nlm_prot.h
rename to include/freebsd/rpcsvc/nlm_prot.h
diff --git a/include_bsd/rpcsvc/nlm_prot.x b/include/freebsd/rpcsvc/nlm_prot.x
similarity index 100%
rename from include_bsd/rpcsvc/nlm_prot.x
rename to include/freebsd/rpcsvc/nlm_prot.x
diff --git a/include_bsd/rpcsvc/rex.h b/include/freebsd/rpcsvc/rex.h
similarity index 100%
rename from include_bsd/rpcsvc/rex.h
rename to include/freebsd/rpcsvc/rex.h
diff --git a/include_bsd/rpcsvc/rex.x b/include/freebsd/rpcsvc/rex.x
similarity index 100%
rename from include_bsd/rpcsvc/rex.x
rename to include/freebsd/rpcsvc/rex.x
diff --git a/include_bsd/rpcsvc/rnusers.h b/include/freebsd/rpcsvc/rnusers.h
similarity index 100%
rename from include_bsd/rpcsvc/rnusers.h
rename to include/freebsd/rpcsvc/rnusers.h
diff --git a/include_bsd/rpcsvc/rnusers.x b/include/freebsd/rpcsvc/rnusers.x
similarity index 100%
rename from include_bsd/rpcsvc/rnusers.x
rename to include/freebsd/rpcsvc/rnusers.x
diff --git a/include_bsd/rpcsvc/rquota.h b/include/freebsd/rpcsvc/rquota.h
similarity index 100%
rename from include_bsd/rpcsvc/rquota.h
rename to include/freebsd/rpcsvc/rquota.h
diff --git a/include_bsd/rpcsvc/rquota.x b/include/freebsd/rpcsvc/rquota.x
similarity index 100%
rename from include_bsd/rpcsvc/rquota.x
rename to include/freebsd/rpcsvc/rquota.x
diff --git a/include_bsd/rpcsvc/rstat.h b/include/freebsd/rpcsvc/rstat.h
similarity index 100%
rename from include_bsd/rpcsvc/rstat.h
rename to include/freebsd/rpcsvc/rstat.h
diff --git a/include_bsd/rpcsvc/rstat.x b/include/freebsd/rpcsvc/rstat.x
similarity index 100%
rename from include_bsd/rpcsvc/rstat.x
rename to include/freebsd/rpcsvc/rstat.x
diff --git a/include_bsd/rpcsvc/rwall.h b/include/freebsd/rpcsvc/rwall.h
similarity index 100%
rename from include_bsd/rpcsvc/rwall.h
rename to include/freebsd/rpcsvc/rwall.h
diff --git a/include_bsd/rpcsvc/rwall.x b/include/freebsd/rpcsvc/rwall.x
similarity index 100%
rename from include_bsd/rpcsvc/rwall.x
rename to include/freebsd/rpcsvc/rwall.x
diff --git a/include_bsd/rpcsvc/sm_inter.h b/include/freebsd/rpcsvc/sm_inter.h
similarity index 100%
rename from include_bsd/rpcsvc/sm_inter.h
rename to include/freebsd/rpcsvc/sm_inter.h
diff --git a/include_bsd/rpcsvc/sm_inter.x b/include/freebsd/rpcsvc/sm_inter.x
similarity index 100%
rename from include_bsd/rpcsvc/sm_inter.x
rename to include/freebsd/rpcsvc/sm_inter.x
diff --git a/include_bsd/rpcsvc/spray.h b/include/freebsd/rpcsvc/spray.h
similarity index 100%
rename from include_bsd/rpcsvc/spray.h
rename to include/freebsd/rpcsvc/spray.h
diff --git a/include_bsd/rpcsvc/spray.x b/include/freebsd/rpcsvc/spray.x
similarity index 100%
rename from include_bsd/rpcsvc/spray.x
rename to include/freebsd/rpcsvc/spray.x
diff --git a/include_bsd/rpcsvc/yp.h b/include/freebsd/rpcsvc/yp.h
similarity index 100%
rename from include_bsd/rpcsvc/yp.h
rename to include/freebsd/rpcsvc/yp.h
diff --git a/include_bsd/rpcsvc/yp.x b/include/freebsd/rpcsvc/yp.x
similarity index 100%
rename from include_bsd/rpcsvc/yp.x
rename to include/freebsd/rpcsvc/yp.x
diff --git a/include_bsd/rpcsvc/yp_prot.h b/include/freebsd/rpcsvc/yp_prot.h
similarity index 100%
rename from include_bsd/rpcsvc/yp_prot.h
rename to include/freebsd/rpcsvc/yp_prot.h
diff --git a/include_bsd/rpcsvc/ypclnt.h b/include/freebsd/rpcsvc/ypclnt.h
similarity index 100%
rename from include_bsd/rpcsvc/ypclnt.h
rename to include/freebsd/rpcsvc/ypclnt.h
diff --git a/include_bsd/rpcsvc/yppasswd.h b/include/freebsd/rpcsvc/yppasswd.h
similarity index 100%
rename from include_bsd/rpcsvc/yppasswd.h
rename to include/freebsd/rpcsvc/yppasswd.h
diff --git a/include_bsd/rpcsvc/yppasswd.x b/include/freebsd/rpcsvc/yppasswd.x
similarity index 100%
rename from include_bsd/rpcsvc/yppasswd.x
rename to include/freebsd/rpcsvc/yppasswd.x
diff --git a/include_bsd/rpcsvc/ypupdate_prot.h b/include/freebsd/rpcsvc/ypupdate_prot.h
similarity index 100%
rename from include_bsd/rpcsvc/ypupdate_prot.h
rename to include/freebsd/rpcsvc/ypupdate_prot.h
diff --git a/include_bsd/rpcsvc/ypupdate_prot.x b/include/freebsd/rpcsvc/ypupdate_prot.x
similarity index 100%
rename from include_bsd/rpcsvc/ypupdate_prot.x
rename to include/freebsd/rpcsvc/ypupdate_prot.x
diff --git a/include_bsd/rpcsvc/ypxfrd.h b/include/freebsd/rpcsvc/ypxfrd.h
similarity index 100%
rename from include_bsd/rpcsvc/ypxfrd.h
rename to include/freebsd/rpcsvc/ypxfrd.h
diff --git a/include_bsd/rpcsvc/ypxfrd.x b/include/freebsd/rpcsvc/ypxfrd.x
similarity index 100%
rename from include_bsd/rpcsvc/ypxfrd.x
rename to include/freebsd/rpcsvc/ypxfrd.x
diff --git a/include_bsd/rpoll.h b/include/freebsd/rpoll.h
similarity index 100%
rename from include_bsd/rpoll.h
rename to include/freebsd/rpoll.h
diff --git a/include_bsd/rtbl.h b/include/freebsd/rtbl.h
similarity index 100%
rename from include_bsd/rtbl.h
rename to include/freebsd/rtbl.h
diff --git a/include_bsd/rtld_db.h b/include/freebsd/rtld_db.h
similarity index 100%
rename from include_bsd/rtld_db.h
rename to include/freebsd/rtld_db.h
diff --git a/include_bsd/runetype.h b/include/freebsd/runetype.h
similarity index 100%
rename from include_bsd/runetype.h
rename to include/freebsd/runetype.h
diff --git a/include_bsd/sched.h b/include/freebsd/sched.h
similarity index 100%
rename from include_bsd/sched.h
rename to include/freebsd/sched.h
diff --git a/include_bsd/sdp.h b/include/freebsd/sdp.h
similarity index 100%
rename from include_bsd/sdp.h
rename to include/freebsd/sdp.h
diff --git a/include_bsd/search.h b/include/freebsd/search.h
similarity index 100%
rename from include_bsd/search.h
rename to include/freebsd/search.h
diff --git a/include_bsd/security/audit/audit.h b/include/freebsd/security/audit/audit.h
similarity index 100%
rename from include_bsd/security/audit/audit.h
rename to include/freebsd/security/audit/audit.h
diff --git a/include_bsd/security/audit/audit_ioctl.h b/include/freebsd/security/audit/audit_ioctl.h
similarity index 100%
rename from include_bsd/security/audit/audit_ioctl.h
rename to include/freebsd/security/audit/audit_ioctl.h
diff --git a/include_bsd/security/audit/audit_private.h b/include/freebsd/security/audit/audit_private.h
similarity index 100%
rename from include_bsd/security/audit/audit_private.h
rename to include/freebsd/security/audit/audit_private.h
diff --git a/include_bsd/security/mac_biba/mac_biba.h b/include/freebsd/security/mac_biba/mac_biba.h
similarity index 100%
rename from include_bsd/security/mac_biba/mac_biba.h
rename to include/freebsd/security/mac_biba/mac_biba.h
diff --git a/include_bsd/security/mac_bsdextended/mac_bsdextended.h b/include/freebsd/security/mac_bsdextended/mac_bsdextended.h
similarity index 100%
rename from include_bsd/security/mac_bsdextended/mac_bsdextended.h
rename to include/freebsd/security/mac_bsdextended/mac_bsdextended.h
diff --git a/include_bsd/security/mac_bsdextended/ugidfw_internal.h b/include/freebsd/security/mac_bsdextended/ugidfw_internal.h
similarity index 100%
rename from include_bsd/security/mac_bsdextended/ugidfw_internal.h
rename to include/freebsd/security/mac_bsdextended/ugidfw_internal.h
diff --git a/include_bsd/security/mac_lomac/mac_lomac.h b/include/freebsd/security/mac_lomac/mac_lomac.h
similarity index 100%
rename from include_bsd/security/mac_lomac/mac_lomac.h
rename to include/freebsd/security/mac_lomac/mac_lomac.h
diff --git a/include_bsd/security/mac_mls/mac_mls.h b/include/freebsd/security/mac_mls/mac_mls.h
similarity index 100%
rename from include_bsd/security/mac_mls/mac_mls.h
rename to include/freebsd/security/mac_mls/mac_mls.h
diff --git a/include_bsd/security/mac_partition/mac_partition.h b/include/freebsd/security/mac_partition/mac_partition.h
similarity index 100%
rename from include_bsd/security/mac_partition/mac_partition.h
rename to include/freebsd/security/mac_partition/mac_partition.h
diff --git a/include_bsd/security/openpam.h b/include/freebsd/security/openpam.h
similarity index 100%
rename from include_bsd/security/openpam.h
rename to include/freebsd/security/openpam.h
diff --git a/include_bsd/security/openpam_attr.h b/include/freebsd/security/openpam_attr.h
similarity index 100%
rename from include_bsd/security/openpam_attr.h
rename to include/freebsd/security/openpam_attr.h
diff --git a/include_bsd/security/openpam_version.h b/include/freebsd/security/openpam_version.h
similarity index 100%
rename from include_bsd/security/openpam_version.h
rename to include/freebsd/security/openpam_version.h
diff --git a/include_bsd/security/pam_appl.h b/include/freebsd/security/pam_appl.h
similarity index 100%
rename from include_bsd/security/pam_appl.h
rename to include/freebsd/security/pam_appl.h
diff --git a/include_bsd/security/pam_constants.h b/include/freebsd/security/pam_constants.h
similarity index 100%
rename from include_bsd/security/pam_constants.h
rename to include/freebsd/security/pam_constants.h
diff --git a/include_bsd/security/pam_mod_misc.h b/include/freebsd/security/pam_mod_misc.h
similarity index 100%
rename from include_bsd/security/pam_mod_misc.h
rename to include/freebsd/security/pam_mod_misc.h
diff --git a/include_bsd/security/pam_modules.h b/include/freebsd/security/pam_modules.h
similarity index 100%
rename from include_bsd/security/pam_modules.h
rename to include/freebsd/security/pam_modules.h
diff --git a/include_bsd/security/pam_types.h b/include/freebsd/security/pam_types.h
similarity index 100%
rename from include_bsd/security/pam_types.h
rename to include/freebsd/security/pam_types.h
diff --git a/include_bsd/semaphore.h b/include/freebsd/semaphore.h
similarity index 100%
rename from include_bsd/semaphore.h
rename to include/freebsd/semaphore.h
diff --git a/include_bsd/setjmp.h b/include/freebsd/setjmp.h
similarity index 100%
rename from include_bsd/setjmp.h
rename to include/freebsd/setjmp.h
diff --git a/include_bsd/sha.h b/include/freebsd/sha.h
similarity index 100%
rename from include_bsd/sha.h
rename to include/freebsd/sha.h
diff --git a/include_bsd/sha256.h b/include/freebsd/sha256.h
similarity index 100%
rename from include_bsd/sha256.h
rename to include/freebsd/sha256.h
diff --git a/include_bsd/sha384.h b/include/freebsd/sha384.h
similarity index 100%
rename from include_bsd/sha384.h
rename to include/freebsd/sha384.h
diff --git a/include_bsd/sha512.h b/include/freebsd/sha512.h
similarity index 100%
rename from include_bsd/sha512.h
rename to include/freebsd/sha512.h
diff --git a/include_bsd/sha512t.h b/include/freebsd/sha512t.h
similarity index 100%
rename from include_bsd/sha512t.h
rename to include/freebsd/sha512t.h
diff --git a/include_bsd/signal.h b/include/freebsd/signal.h
similarity index 100%
rename from include_bsd/signal.h
rename to include/freebsd/signal.h
diff --git a/include_bsd/skein.h b/include/freebsd/skein.h
similarity index 100%
rename from include_bsd/skein.h
rename to include/freebsd/skein.h
diff --git a/include_bsd/skein_freebsd.h b/include/freebsd/skein_freebsd.h
similarity index 100%
rename from include_bsd/skein_freebsd.h
rename to include/freebsd/skein_freebsd.h
diff --git a/include_bsd/skein_iv.h b/include/freebsd/skein_iv.h
similarity index 100%
rename from include_bsd/skein_iv.h
rename to include/freebsd/skein_iv.h
diff --git a/include_bsd/skein_port.h b/include/freebsd/skein_port.h
similarity index 100%
rename from include_bsd/skein_port.h
rename to include/freebsd/skein_port.h
diff --git a/include_bsd/spawn.h b/include/freebsd/spawn.h
similarity index 100%
rename from include_bsd/spawn.h
rename to include/freebsd/spawn.h
diff --git a/include_bsd/ssp/ssp.h b/include/freebsd/ssp/ssp.h
similarity index 100%
rename from include_bsd/ssp/ssp.h
rename to include/freebsd/ssp/ssp.h
diff --git a/include_bsd/ssp/stdio.h b/include/freebsd/ssp/stdio.h
similarity index 100%
rename from include_bsd/ssp/stdio.h
rename to include/freebsd/ssp/stdio.h
diff --git a/include_bsd/ssp/string.h b/include/freebsd/ssp/string.h
similarity index 100%
rename from include_bsd/ssp/string.h
rename to include/freebsd/ssp/string.h
diff --git a/include_bsd/ssp/unistd.h b/include/freebsd/ssp/unistd.h
similarity index 100%
rename from include_bsd/ssp/unistd.h
rename to include/freebsd/ssp/unistd.h
diff --git a/include_bsd/stab.h b/include/freebsd/stab.h
similarity index 100%
rename from include_bsd/stab.h
rename to include/freebsd/stab.h
diff --git a/include_bsd/stand.h b/include/freebsd/stand.h
similarity index 100%
rename from include_bsd/stand.h
rename to include/freebsd/stand.h
diff --git a/include_bsd/stdalign.h b/include/freebsd/stdalign.h
similarity index 100%
rename from include_bsd/stdalign.h
rename to include/freebsd/stdalign.h
diff --git a/include_bsd/stdarg.h b/include/freebsd/stdarg.h
similarity index 100%
rename from include_bsd/stdarg.h
rename to include/freebsd/stdarg.h
diff --git a/include_bsd/stdatomic.h b/include/freebsd/stdatomic.h
similarity index 100%
rename from include_bsd/stdatomic.h
rename to include/freebsd/stdatomic.h
diff --git a/include_bsd/stdbool.h b/include/freebsd/stdbool.h
similarity index 100%
rename from include_bsd/stdbool.h
rename to include/freebsd/stdbool.h
diff --git a/include_bsd/stddef.h b/include/freebsd/stddef.h
similarity index 100%
rename from include_bsd/stddef.h
rename to include/freebsd/stddef.h
diff --git a/include_bsd/stdint.h b/include/freebsd/stdint.h
similarity index 100%
rename from include_bsd/stdint.h
rename to include/freebsd/stdint.h
diff --git a/include_bsd/stdio.h b/include/freebsd/stdio.h
similarity index 100%
rename from include_bsd/stdio.h
rename to include/freebsd/stdio.h
diff --git a/include_bsd/stdlib.h b/include/freebsd/stdlib.h
similarity index 100%
rename from include_bsd/stdlib.h
rename to include/freebsd/stdlib.h
diff --git a/include_bsd/stdnoreturn.h b/include/freebsd/stdnoreturn.h
similarity index 100%
rename from include_bsd/stdnoreturn.h
rename to include/freebsd/stdnoreturn.h
diff --git a/include_bsd/string.h b/include/freebsd/string.h
similarity index 100%
rename from include_bsd/string.h
rename to include/freebsd/string.h
diff --git a/include_bsd/string_m.h b/include/freebsd/string_m.h
similarity index 100%
rename from include_bsd/string_m.h
rename to include/freebsd/string_m.h
diff --git a/include_bsd/stringlist.h b/include/freebsd/stringlist.h
similarity index 100%
rename from include_bsd/stringlist.h
rename to include/freebsd/stringlist.h
diff --git a/include_bsd/strings.h b/include/freebsd/strings.h
similarity index 100%
rename from include_bsd/strings.h
rename to include/freebsd/strings.h
diff --git a/include_bsd/sys/_bitset.h b/include/freebsd/sys/_bitset.h
similarity index 100%
rename from include_bsd/sys/_bitset.h
rename to include/freebsd/sys/_bitset.h
diff --git a/include_bsd/sys/_bus_dma.h b/include/freebsd/sys/_bus_dma.h
similarity index 100%
rename from include_bsd/sys/_bus_dma.h
rename to include/freebsd/sys/_bus_dma.h
diff --git a/include_bsd/sys/_callout.h b/include/freebsd/sys/_callout.h
similarity index 100%
rename from include_bsd/sys/_callout.h
rename to include/freebsd/sys/_callout.h
diff --git a/include_bsd/sys/_cpuset.h b/include/freebsd/sys/_cpuset.h
similarity index 100%
rename from include_bsd/sys/_cpuset.h
rename to include/freebsd/sys/_cpuset.h
diff --git a/include_bsd/sys/_ffcounter.h b/include/freebsd/sys/_ffcounter.h
similarity index 100%
rename from include_bsd/sys/_ffcounter.h
rename to include/freebsd/sys/_ffcounter.h
diff --git a/include_bsd/sys/_iovec.h b/include/freebsd/sys/_iovec.h
similarity index 100%
rename from include_bsd/sys/_iovec.h
rename to include/freebsd/sys/_iovec.h
diff --git a/include_bsd/sys/_kstack_cache.h b/include/freebsd/sys/_kstack_cache.h
similarity index 100%
rename from include_bsd/sys/_kstack_cache.h
rename to include/freebsd/sys/_kstack_cache.h
diff --git a/include_bsd/sys/_lock.h b/include/freebsd/sys/_lock.h
similarity index 100%
rename from include_bsd/sys/_lock.h
rename to include/freebsd/sys/_lock.h
diff --git a/include_bsd/sys/_lockmgr.h b/include/freebsd/sys/_lockmgr.h
similarity index 100%
rename from include_bsd/sys/_lockmgr.h
rename to include/freebsd/sys/_lockmgr.h
diff --git a/include_bsd/sys/_mutex.h b/include/freebsd/sys/_mutex.h
similarity index 100%
rename from include_bsd/sys/_mutex.h
rename to include/freebsd/sys/_mutex.h
diff --git a/include_bsd/sys/_null.h b/include/freebsd/sys/_null.h
similarity index 100%
rename from include_bsd/sys/_null.h
rename to include/freebsd/sys/_null.h
diff --git a/include_bsd/sys/_pctrie.h b/include/freebsd/sys/_pctrie.h
similarity index 100%
rename from include_bsd/sys/_pctrie.h
rename to include/freebsd/sys/_pctrie.h
diff --git a/include_bsd/sys/_pthreadtypes.h b/include/freebsd/sys/_pthreadtypes.h
similarity index 100%
rename from include_bsd/sys/_pthreadtypes.h
rename to include/freebsd/sys/_pthreadtypes.h
diff --git a/include_bsd/sys/_rmlock.h b/include/freebsd/sys/_rmlock.h
similarity index 100%
rename from include_bsd/sys/_rmlock.h
rename to include/freebsd/sys/_rmlock.h
diff --git a/include_bsd/sys/_rwlock.h b/include/freebsd/sys/_rwlock.h
similarity index 100%
rename from include_bsd/sys/_rwlock.h
rename to include/freebsd/sys/_rwlock.h
diff --git a/include_bsd/sys/_semaphore.h b/include/freebsd/sys/_semaphore.h
similarity index 100%
rename from include_bsd/sys/_semaphore.h
rename to include/freebsd/sys/_semaphore.h
diff --git a/include_bsd/sys/_sigset.h b/include/freebsd/sys/_sigset.h
similarity index 100%
rename from include_bsd/sys/_sigset.h
rename to include/freebsd/sys/_sigset.h
diff --git a/include_bsd/sys/_sockaddr_storage.h b/include/freebsd/sys/_sockaddr_storage.h
similarity index 100%
rename from include_bsd/sys/_sockaddr_storage.h
rename to include/freebsd/sys/_sockaddr_storage.h
diff --git a/include_bsd/sys/_stack.h b/include/freebsd/sys/_stack.h
similarity index 100%
rename from include_bsd/sys/_stack.h
rename to include/freebsd/sys/_stack.h
diff --git a/include_bsd/sys/_stdint.h b/include/freebsd/sys/_stdint.h
similarity index 100%
rename from include_bsd/sys/_stdint.h
rename to include/freebsd/sys/_stdint.h
diff --git a/include_bsd/sys/_sx.h b/include/freebsd/sys/_sx.h
similarity index 100%
rename from include_bsd/sys/_sx.h
rename to include/freebsd/sys/_sx.h
diff --git a/include_bsd/sys/_task.h b/include/freebsd/sys/_task.h
similarity index 100%
rename from include_bsd/sys/_task.h
rename to include/freebsd/sys/_task.h
diff --git a/include_bsd/sys/_termios.h b/include/freebsd/sys/_termios.h
similarity index 100%
rename from include_bsd/sys/_termios.h
rename to include/freebsd/sys/_termios.h
diff --git a/include_bsd/sys/_timespec.h b/include/freebsd/sys/_timespec.h
similarity index 100%
rename from include_bsd/sys/_timespec.h
rename to include/freebsd/sys/_timespec.h
diff --git a/include_bsd/sys/_timeval.h b/include/freebsd/sys/_timeval.h
similarity index 100%
rename from include_bsd/sys/_timeval.h
rename to include/freebsd/sys/_timeval.h
diff --git a/include_bsd/sys/_types.h b/include/freebsd/sys/_types.h
similarity index 100%
rename from include_bsd/sys/_types.h
rename to include/freebsd/sys/_types.h
diff --git a/include_bsd/sys/_ucontext.h b/include/freebsd/sys/_ucontext.h
similarity index 100%
rename from include_bsd/sys/_ucontext.h
rename to include/freebsd/sys/_ucontext.h
diff --git a/include_bsd/sys/_umtx.h b/include/freebsd/sys/_umtx.h
similarity index 100%
rename from include_bsd/sys/_umtx.h
rename to include/freebsd/sys/_umtx.h
diff --git a/include_bsd/sys/_unrhdr.h b/include/freebsd/sys/_unrhdr.h
similarity index 100%
rename from include_bsd/sys/_unrhdr.h
rename to include/freebsd/sys/_unrhdr.h
diff --git a/include_bsd/sys/_vm_domain.h b/include/freebsd/sys/_vm_domain.h
similarity index 100%
rename from include_bsd/sys/_vm_domain.h
rename to include/freebsd/sys/_vm_domain.h
diff --git a/include_bsd/sys/aac_ioctl.h b/include/freebsd/sys/aac_ioctl.h
similarity index 100%
rename from include_bsd/sys/aac_ioctl.h
rename to include/freebsd/sys/aac_ioctl.h
diff --git a/include_bsd/sys/acct.h b/include/freebsd/sys/acct.h
similarity index 100%
rename from include_bsd/sys/acct.h
rename to include/freebsd/sys/acct.h
diff --git a/include_bsd/sys/acl.h b/include/freebsd/sys/acl.h
similarity index 100%
rename from include_bsd/sys/acl.h
rename to include/freebsd/sys/acl.h
diff --git a/include_bsd/sys/agpio.h b/include/freebsd/sys/agpio.h
similarity index 100%
rename from include_bsd/sys/agpio.h
rename to include/freebsd/sys/agpio.h
diff --git a/include_bsd/sys/aio.h b/include/freebsd/sys/aio.h
similarity index 100%
rename from include_bsd/sys/aio.h
rename to include/freebsd/sys/aio.h
diff --git a/include_bsd/sys/alq.h b/include/freebsd/sys/alq.h
similarity index 100%
rename from include_bsd/sys/alq.h
rename to include/freebsd/sys/alq.h
diff --git a/include_bsd/sys/apm.h b/include/freebsd/sys/apm.h
similarity index 100%
rename from include_bsd/sys/apm.h
rename to include/freebsd/sys/apm.h
diff --git a/include_bsd/sys/assym.h b/include/freebsd/sys/assym.h
similarity index 100%
rename from include_bsd/sys/assym.h
rename to include/freebsd/sys/assym.h
diff --git a/include_bsd/sys/ata.h b/include/freebsd/sys/ata.h
similarity index 100%
rename from include_bsd/sys/ata.h
rename to include/freebsd/sys/ata.h
diff --git a/include_bsd/sys/bio.h b/include/freebsd/sys/bio.h
similarity index 100%
rename from include_bsd/sys/bio.h
rename to include/freebsd/sys/bio.h
diff --git a/include_bsd/sys/bitset.h b/include/freebsd/sys/bitset.h
similarity index 100%
rename from include_bsd/sys/bitset.h
rename to include/freebsd/sys/bitset.h
diff --git a/include_bsd/sys/bitstring.h b/include/freebsd/sys/bitstring.h
similarity index 100%
rename from include_bsd/sys/bitstring.h
rename to include/freebsd/sys/bitstring.h
diff --git a/include_bsd/sys/blist.h b/include/freebsd/sys/blist.h
similarity index 100%
rename from include_bsd/sys/blist.h
rename to include/freebsd/sys/blist.h
diff --git a/include_bsd/sys/boot.h b/include/freebsd/sys/boot.h
similarity index 100%
rename from include_bsd/sys/boot.h
rename to include/freebsd/sys/boot.h
diff --git a/include_bsd/sys/buf.h b/include/freebsd/sys/buf.h
similarity index 100%
rename from include_bsd/sys/buf.h
rename to include/freebsd/sys/buf.h
diff --git a/include_bsd/sys/buf_ring.h b/include/freebsd/sys/buf_ring.h
similarity index 100%
rename from include_bsd/sys/buf_ring.h
rename to include/freebsd/sys/buf_ring.h
diff --git a/include_bsd/sys/bufobj.h b/include/freebsd/sys/bufobj.h
similarity index 100%
rename from include_bsd/sys/bufobj.h
rename to include/freebsd/sys/bufobj.h
diff --git a/include_bsd/sys/bus.h b/include/freebsd/sys/bus.h
similarity index 100%
rename from include_bsd/sys/bus.h
rename to include/freebsd/sys/bus.h
diff --git a/include_bsd/sys/bus_dma.h b/include/freebsd/sys/bus_dma.h
similarity index 100%
rename from include_bsd/sys/bus_dma.h
rename to include/freebsd/sys/bus_dma.h
diff --git a/include_bsd/sys/busdma_bufalloc.h b/include/freebsd/sys/busdma_bufalloc.h
similarity index 100%
rename from include_bsd/sys/busdma_bufalloc.h
rename to include/freebsd/sys/busdma_bufalloc.h
diff --git a/include_bsd/sys/callout.h b/include/freebsd/sys/callout.h
similarity index 100%
rename from include_bsd/sys/callout.h
rename to include/freebsd/sys/callout.h
diff --git a/include_bsd/sys/capability.h b/include/freebsd/sys/capability.h
similarity index 100%
rename from include_bsd/sys/capability.h
rename to include/freebsd/sys/capability.h
diff --git a/include_bsd/sys/caprights.h b/include/freebsd/sys/caprights.h
similarity index 100%
rename from include_bsd/sys/caprights.h
rename to include/freebsd/sys/caprights.h
diff --git a/include_bsd/sys/capsicum.h b/include/freebsd/sys/capsicum.h
similarity index 100%
rename from include_bsd/sys/capsicum.h
rename to include/freebsd/sys/capsicum.h
diff --git a/include_bsd/sys/cdefs.h b/include/freebsd/sys/cdefs.h
similarity index 100%
rename from include_bsd/sys/cdefs.h
rename to include/freebsd/sys/cdefs.h
diff --git a/include_bsd/sys/cdio.h b/include/freebsd/sys/cdio.h
similarity index 100%
rename from include_bsd/sys/cdio.h
rename to include/freebsd/sys/cdio.h
diff --git a/include_bsd/sys/cdrio.h b/include/freebsd/sys/cdrio.h
similarity index 100%
rename from include_bsd/sys/cdrio.h
rename to include/freebsd/sys/cdrio.h
diff --git a/include_bsd/sys/cfictl.h b/include/freebsd/sys/cfictl.h
similarity index 100%
rename from include_bsd/sys/cfictl.h
rename to include/freebsd/sys/cfictl.h
diff --git a/include_bsd/sys/chio.h b/include/freebsd/sys/chio.h
similarity index 100%
rename from include_bsd/sys/chio.h
rename to include/freebsd/sys/chio.h
diff --git a/include_bsd/sys/clock.h b/include/freebsd/sys/clock.h
similarity index 100%
rename from include_bsd/sys/clock.h
rename to include/freebsd/sys/clock.h
diff --git a/include_bsd/sys/condvar.h b/include/freebsd/sys/condvar.h
similarity index 100%
rename from include_bsd/sys/condvar.h
rename to include/freebsd/sys/condvar.h
diff --git a/include_bsd/sys/conf.h b/include/freebsd/sys/conf.h
similarity index 100%
rename from include_bsd/sys/conf.h
rename to include/freebsd/sys/conf.h
diff --git a/include_bsd/sys/cons.h b/include/freebsd/sys/cons.h
similarity index 100%
rename from include_bsd/sys/cons.h
rename to include/freebsd/sys/cons.h
diff --git a/include_bsd/sys/consio.h b/include/freebsd/sys/consio.h
similarity index 100%
rename from include_bsd/sys/consio.h
rename to include/freebsd/sys/consio.h
diff --git a/include_bsd/sys/copyright.h b/include/freebsd/sys/copyright.h
similarity index 100%
rename from include_bsd/sys/copyright.h
rename to include/freebsd/sys/copyright.h
diff --git a/include_bsd/sys/counter.h b/include/freebsd/sys/counter.h
similarity index 100%
rename from include_bsd/sys/counter.h
rename to include/freebsd/sys/counter.h
diff --git a/include_bsd/sys/cpu.h b/include/freebsd/sys/cpu.h
similarity index 100%
rename from include_bsd/sys/cpu.h
rename to include/freebsd/sys/cpu.h
diff --git a/include_bsd/sys/cpuctl.h b/include/freebsd/sys/cpuctl.h
similarity index 100%
rename from include_bsd/sys/cpuctl.h
rename to include/freebsd/sys/cpuctl.h
diff --git a/include_bsd/sys/cpuset.h b/include/freebsd/sys/cpuset.h
similarity index 100%
rename from include_bsd/sys/cpuset.h
rename to include/freebsd/sys/cpuset.h
diff --git a/include_bsd/sys/ctype.h b/include/freebsd/sys/ctype.h
similarity index 100%
rename from include_bsd/sys/ctype.h
rename to include/freebsd/sys/ctype.h
diff --git a/include_bsd/sys/dataacq.h b/include/freebsd/sys/dataacq.h
similarity index 100%
rename from include_bsd/sys/dataacq.h
rename to include/freebsd/sys/dataacq.h
diff --git a/include_bsd/sys/devicestat.h b/include/freebsd/sys/devicestat.h
similarity index 100%
rename from include_bsd/sys/devicestat.h
rename to include/freebsd/sys/devicestat.h
diff --git a/include_bsd/sys/devmap.h b/include/freebsd/sys/devmap.h
similarity index 100%
rename from include_bsd/sys/devmap.h
rename to include/freebsd/sys/devmap.h
diff --git a/include_bsd/sys/digiio.h b/include/freebsd/sys/digiio.h
similarity index 100%
rename from include_bsd/sys/digiio.h
rename to include/freebsd/sys/digiio.h
diff --git a/include_bsd/sys/dir.h b/include/freebsd/sys/dir.h
similarity index 100%
rename from include_bsd/sys/dir.h
rename to include/freebsd/sys/dir.h
diff --git a/include_bsd/sys/dirent.h b/include/freebsd/sys/dirent.h
similarity index 100%
rename from include_bsd/sys/dirent.h
rename to include/freebsd/sys/dirent.h
diff --git a/include_bsd/sys/disk.h b/include/freebsd/sys/disk.h
similarity index 100%
rename from include_bsd/sys/disk.h
rename to include/freebsd/sys/disk.h
diff --git a/include_bsd/sys/disk_zone.h b/include/freebsd/sys/disk_zone.h
similarity index 100%
rename from include_bsd/sys/disk_zone.h
rename to include/freebsd/sys/disk_zone.h
diff --git a/include_bsd/sys/disklabel.h b/include/freebsd/sys/disklabel.h
similarity index 100%
rename from include_bsd/sys/disklabel.h
rename to include/freebsd/sys/disklabel.h
diff --git a/include_bsd/sys/diskmbr.h b/include/freebsd/sys/diskmbr.h
similarity index 100%
rename from include_bsd/sys/diskmbr.h
rename to include/freebsd/sys/diskmbr.h
diff --git a/include_bsd/sys/diskpc98.h b/include/freebsd/sys/diskpc98.h
similarity index 100%
rename from include_bsd/sys/diskpc98.h
rename to include/freebsd/sys/diskpc98.h
diff --git a/include_bsd/sys/dkstat.h b/include/freebsd/sys/dkstat.h
similarity index 100%
rename from include_bsd/sys/dkstat.h
rename to include/freebsd/sys/dkstat.h
diff --git a/include_bsd/sys/dnv.h b/include/freebsd/sys/dnv.h
similarity index 100%
rename from include_bsd/sys/dnv.h
rename to include/freebsd/sys/dnv.h
diff --git a/include_bsd/sys/domain.h b/include/freebsd/sys/domain.h
similarity index 100%
rename from include_bsd/sys/domain.h
rename to include/freebsd/sys/domain.h
diff --git a/include_bsd/sys/dtrace_bsd.h b/include/freebsd/sys/dtrace_bsd.h
similarity index 100%
rename from include_bsd/sys/dtrace_bsd.h
rename to include/freebsd/sys/dtrace_bsd.h
diff --git a/include_bsd/sys/dvdio.h b/include/freebsd/sys/dvdio.h
similarity index 100%
rename from include_bsd/sys/dvdio.h
rename to include/freebsd/sys/dvdio.h
diff --git a/include_bsd/sys/efi.h b/include/freebsd/sys/efi.h
similarity index 100%
rename from include_bsd/sys/efi.h
rename to include/freebsd/sys/efi.h
diff --git a/include_bsd/sys/elf.h b/include/freebsd/sys/elf.h
similarity index 100%
rename from include_bsd/sys/elf.h
rename to include/freebsd/sys/elf.h
diff --git a/include_bsd/sys/elf32.h b/include/freebsd/sys/elf32.h
similarity index 100%
rename from include_bsd/sys/elf32.h
rename to include/freebsd/sys/elf32.h
diff --git a/include_bsd/sys/elf64.h b/include/freebsd/sys/elf64.h
similarity index 100%
rename from include_bsd/sys/elf64.h
rename to include/freebsd/sys/elf64.h
diff --git a/include_bsd/sys/elf_common.h b/include/freebsd/sys/elf_common.h
similarity index 100%
rename from include_bsd/sys/elf_common.h
rename to include/freebsd/sys/elf_common.h
diff --git a/include_bsd/sys/elf_generic.h b/include/freebsd/sys/elf_generic.h
similarity index 100%
rename from include_bsd/sys/elf_generic.h
rename to include/freebsd/sys/elf_generic.h
diff --git a/include_bsd/sys/endian.h b/include/freebsd/sys/endian.h
similarity index 100%
rename from include_bsd/sys/endian.h
rename to include/freebsd/sys/endian.h
diff --git a/include_bsd/sys/errno.h b/include/freebsd/sys/errno.h
similarity index 100%
rename from include_bsd/sys/errno.h
rename to include/freebsd/sys/errno.h
diff --git a/include_bsd/sys/eui64.h b/include/freebsd/sys/eui64.h
similarity index 100%
rename from include_bsd/sys/eui64.h
rename to include/freebsd/sys/eui64.h
diff --git a/include_bsd/sys/event.h b/include/freebsd/sys/event.h
similarity index 100%
rename from include_bsd/sys/event.h
rename to include/freebsd/sys/event.h
diff --git a/include_bsd/sys/eventhandler.h b/include/freebsd/sys/eventhandler.h
similarity index 100%
rename from include_bsd/sys/eventhandler.h
rename to include/freebsd/sys/eventhandler.h
diff --git a/include_bsd/sys/eventvar.h b/include/freebsd/sys/eventvar.h
similarity index 100%
rename from include_bsd/sys/eventvar.h
rename to include/freebsd/sys/eventvar.h
diff --git a/include_bsd/sys/exec.h b/include/freebsd/sys/exec.h
similarity index 100%
rename from include_bsd/sys/exec.h
rename to include/freebsd/sys/exec.h
diff --git a/include_bsd/sys/extattr.h b/include/freebsd/sys/extattr.h
similarity index 100%
rename from include_bsd/sys/extattr.h
rename to include/freebsd/sys/extattr.h
diff --git a/include_bsd/sys/fail.h b/include/freebsd/sys/fail.h
similarity index 100%
rename from include_bsd/sys/fail.h
rename to include/freebsd/sys/fail.h
diff --git a/include_bsd/sys/fbio.h b/include/freebsd/sys/fbio.h
similarity index 100%
rename from include_bsd/sys/fbio.h
rename to include/freebsd/sys/fbio.h
diff --git a/include_bsd/sys/fcntl.h b/include/freebsd/sys/fcntl.h
similarity index 100%
rename from include_bsd/sys/fcntl.h
rename to include/freebsd/sys/fcntl.h
diff --git a/include_bsd/sys/fdcio.h b/include/freebsd/sys/fdcio.h
similarity index 100%
rename from include_bsd/sys/fdcio.h
rename to include/freebsd/sys/fdcio.h
diff --git a/include_bsd/sys/file.h b/include/freebsd/sys/file.h
similarity index 100%
rename from include_bsd/sys/file.h
rename to include/freebsd/sys/file.h
diff --git a/include_bsd/sys/filedesc.h b/include/freebsd/sys/filedesc.h
similarity index 100%
rename from include_bsd/sys/filedesc.h
rename to include/freebsd/sys/filedesc.h
diff --git a/include_bsd/sys/filio.h b/include/freebsd/sys/filio.h
similarity index 100%
rename from include_bsd/sys/filio.h
rename to include/freebsd/sys/filio.h
diff --git a/include_bsd/sys/firmware.h b/include/freebsd/sys/firmware.h
similarity index 100%
rename from include_bsd/sys/firmware.h
rename to include/freebsd/sys/firmware.h
diff --git a/include_bsd/sys/fnv_hash.h b/include/freebsd/sys/fnv_hash.h
similarity index 100%
rename from include_bsd/sys/fnv_hash.h
rename to include/freebsd/sys/fnv_hash.h
diff --git a/include_bsd/sys/gmon.h b/include/freebsd/sys/gmon.h
similarity index 100%
rename from include_bsd/sys/gmon.h
rename to include/freebsd/sys/gmon.h
diff --git a/include_bsd/sys/gpio.h b/include/freebsd/sys/gpio.h
similarity index 100%
rename from include_bsd/sys/gpio.h
rename to include/freebsd/sys/gpio.h
diff --git a/include_bsd/sys/gpt.h b/include/freebsd/sys/gpt.h
similarity index 100%
rename from include_bsd/sys/gpt.h
rename to include/freebsd/sys/gpt.h
diff --git a/include_bsd/sys/gtaskqueue.h b/include/freebsd/sys/gtaskqueue.h
similarity index 100%
rename from include_bsd/sys/gtaskqueue.h
rename to include/freebsd/sys/gtaskqueue.h
diff --git a/include_bsd/sys/gzio.h b/include/freebsd/sys/gzio.h
similarity index 100%
rename from include_bsd/sys/gzio.h
rename to include/freebsd/sys/gzio.h
diff --git a/include_bsd/sys/hash.h b/include/freebsd/sys/hash.h
similarity index 100%
rename from include_bsd/sys/hash.h
rename to include/freebsd/sys/hash.h
diff --git a/include_bsd/sys/hhook.h b/include/freebsd/sys/hhook.h
similarity index 100%
rename from include_bsd/sys/hhook.h
rename to include/freebsd/sys/hhook.h
diff --git a/include_bsd/sys/iconv.h b/include/freebsd/sys/iconv.h
similarity index 100%
rename from include_bsd/sys/iconv.h
rename to include/freebsd/sys/iconv.h
diff --git a/include_bsd/sys/imgact.h b/include/freebsd/sys/imgact.h
similarity index 100%
rename from include_bsd/sys/imgact.h
rename to include/freebsd/sys/imgact.h
diff --git a/include_bsd/sys/imgact_aout.h b/include/freebsd/sys/imgact_aout.h
similarity index 100%
rename from include_bsd/sys/imgact_aout.h
rename to include/freebsd/sys/imgact_aout.h
diff --git a/include_bsd/sys/imgact_binmisc.h b/include/freebsd/sys/imgact_binmisc.h
similarity index 100%
rename from include_bsd/sys/imgact_binmisc.h
rename to include/freebsd/sys/imgact_binmisc.h
diff --git a/include_bsd/sys/imgact_elf.h b/include/freebsd/sys/imgact_elf.h
similarity index 100%
rename from include_bsd/sys/imgact_elf.h
rename to include/freebsd/sys/imgact_elf.h
diff --git a/include_bsd/sys/inflate.h b/include/freebsd/sys/inflate.h
similarity index 100%
rename from include_bsd/sys/inflate.h
rename to include/freebsd/sys/inflate.h
diff --git a/include_bsd/sys/interrupt.h b/include/freebsd/sys/interrupt.h
similarity index 100%
rename from include_bsd/sys/interrupt.h
rename to include/freebsd/sys/interrupt.h
diff --git a/include_bsd/sys/intr.h b/include/freebsd/sys/intr.h
similarity index 100%
rename from include_bsd/sys/intr.h
rename to include/freebsd/sys/intr.h
diff --git a/include_bsd/sys/ioccom.h b/include/freebsd/sys/ioccom.h
similarity index 100%
rename from include_bsd/sys/ioccom.h
rename to include/freebsd/sys/ioccom.h
diff --git a/include_bsd/sys/ioctl.h b/include/freebsd/sys/ioctl.h
similarity index 100%
rename from include_bsd/sys/ioctl.h
rename to include/freebsd/sys/ioctl.h
diff --git a/include_bsd/sys/ioctl_compat.h b/include/freebsd/sys/ioctl_compat.h
similarity index 100%
rename from include_bsd/sys/ioctl_compat.h
rename to include/freebsd/sys/ioctl_compat.h
diff --git a/include_bsd/sys/iov.h b/include/freebsd/sys/iov.h
similarity index 100%
rename from include_bsd/sys/iov.h
rename to include/freebsd/sys/iov.h
diff --git a/include_bsd/sys/iov_schema.h b/include/freebsd/sys/iov_schema.h
similarity index 100%
rename from include_bsd/sys/iov_schema.h
rename to include/freebsd/sys/iov_schema.h
diff --git a/include_bsd/sys/ipc.h b/include/freebsd/sys/ipc.h
similarity index 100%
rename from include_bsd/sys/ipc.h
rename to include/freebsd/sys/ipc.h
diff --git a/include_bsd/sys/ipmi.h b/include/freebsd/sys/ipmi.h
similarity index 100%
rename from include_bsd/sys/ipmi.h
rename to include/freebsd/sys/ipmi.h
diff --git a/include_bsd/sys/jail.h b/include/freebsd/sys/jail.h
similarity index 100%
rename from include_bsd/sys/jail.h
rename to include/freebsd/sys/jail.h
diff --git a/include_bsd/sys/joystick.h b/include/freebsd/sys/joystick.h
similarity index 100%
rename from include_bsd/sys/joystick.h
rename to include/freebsd/sys/joystick.h
diff --git a/include_bsd/sys/kbio.h b/include/freebsd/sys/kbio.h
similarity index 100%
rename from include_bsd/sys/kbio.h
rename to include/freebsd/sys/kbio.h
diff --git a/include_bsd/sys/kdb.h b/include/freebsd/sys/kdb.h
similarity index 100%
rename from include_bsd/sys/kdb.h
rename to include/freebsd/sys/kdb.h
diff --git a/include_bsd/sys/kenv.h b/include/freebsd/sys/kenv.h
similarity index 100%
rename from include_bsd/sys/kenv.h
rename to include/freebsd/sys/kenv.h
diff --git a/include_bsd/sys/kernel.h b/include/freebsd/sys/kernel.h
similarity index 100%
rename from include_bsd/sys/kernel.h
rename to include/freebsd/sys/kernel.h
diff --git a/include_bsd/sys/kerneldump.h b/include/freebsd/sys/kerneldump.h
similarity index 100%
rename from include_bsd/sys/kerneldump.h
rename to include/freebsd/sys/kerneldump.h
diff --git a/include_bsd/sys/khelp.h b/include/freebsd/sys/khelp.h
similarity index 100%
rename from include_bsd/sys/khelp.h
rename to include/freebsd/sys/khelp.h
diff --git a/include_bsd/sys/kobj.h b/include/freebsd/sys/kobj.h
similarity index 100%
rename from include_bsd/sys/kobj.h
rename to include/freebsd/sys/kobj.h
diff --git a/include_bsd/sys/ksem.h b/include/freebsd/sys/ksem.h
similarity index 100%
rename from include_bsd/sys/ksem.h
rename to include/freebsd/sys/ksem.h
diff --git a/include_bsd/sys/ksyms.h b/include/freebsd/sys/ksyms.h
similarity index 100%
rename from include_bsd/sys/ksyms.h
rename to include/freebsd/sys/ksyms.h
diff --git a/include_bsd/sys/kthread.h b/include/freebsd/sys/kthread.h
similarity index 100%
rename from include_bsd/sys/kthread.h
rename to include/freebsd/sys/kthread.h
diff --git a/include_bsd/sys/ktr.h b/include/freebsd/sys/ktr.h
similarity index 100%
rename from include_bsd/sys/ktr.h
rename to include/freebsd/sys/ktr.h
diff --git a/include_bsd/sys/ktr_class.h b/include/freebsd/sys/ktr_class.h
similarity index 100%
rename from include_bsd/sys/ktr_class.h
rename to include/freebsd/sys/ktr_class.h
diff --git a/include_bsd/sys/ktrace.h b/include/freebsd/sys/ktrace.h
similarity index 100%
rename from include_bsd/sys/ktrace.h
rename to include/freebsd/sys/ktrace.h
diff --git a/include_bsd/sys/libkern.h b/include/freebsd/sys/libkern.h
similarity index 100%
rename from include_bsd/sys/libkern.h
rename to include/freebsd/sys/libkern.h
diff --git a/include_bsd/sys/limits.h b/include/freebsd/sys/limits.h
similarity index 100%
rename from include_bsd/sys/limits.h
rename to include/freebsd/sys/limits.h
diff --git a/include_bsd/sys/link_aout.h b/include/freebsd/sys/link_aout.h
similarity index 100%
rename from include_bsd/sys/link_aout.h
rename to include/freebsd/sys/link_aout.h
diff --git a/include_bsd/sys/link_elf.h b/include/freebsd/sys/link_elf.h
similarity index 100%
rename from include_bsd/sys/link_elf.h
rename to include/freebsd/sys/link_elf.h
diff --git a/include_bsd/sys/linker.h b/include/freebsd/sys/linker.h
similarity index 100%
rename from include_bsd/sys/linker.h
rename to include/freebsd/sys/linker.h
diff --git a/include_bsd/sys/linker_set.h b/include/freebsd/sys/linker_set.h
similarity index 100%
rename from include_bsd/sys/linker_set.h
rename to include/freebsd/sys/linker_set.h
diff --git a/include_bsd/sys/lock.h b/include/freebsd/sys/lock.h
similarity index 100%
rename from include_bsd/sys/lock.h
rename to include/freebsd/sys/lock.h
diff --git a/include_bsd/sys/lock_profile.h b/include/freebsd/sys/lock_profile.h
similarity index 100%
rename from include_bsd/sys/lock_profile.h
rename to include/freebsd/sys/lock_profile.h
diff --git a/include_bsd/sys/lockf.h b/include/freebsd/sys/lockf.h
similarity index 100%
rename from include_bsd/sys/lockf.h
rename to include/freebsd/sys/lockf.h
diff --git a/include_bsd/sys/lockmgr.h b/include/freebsd/sys/lockmgr.h
similarity index 100%
rename from include_bsd/sys/lockmgr.h
rename to include/freebsd/sys/lockmgr.h
diff --git a/include_bsd/sys/lockstat.h b/include/freebsd/sys/lockstat.h
similarity index 100%
rename from include_bsd/sys/lockstat.h
rename to include/freebsd/sys/lockstat.h
diff --git a/include_bsd/sys/loginclass.h b/include/freebsd/sys/loginclass.h
similarity index 100%
rename from include_bsd/sys/loginclass.h
rename to include/freebsd/sys/loginclass.h
diff --git a/include_bsd/sys/mac.h b/include/freebsd/sys/mac.h
similarity index 100%
rename from include_bsd/sys/mac.h
rename to include/freebsd/sys/mac.h
diff --git a/include_bsd/sys/malloc.h b/include/freebsd/sys/malloc.h
similarity index 100%
rename from include_bsd/sys/malloc.h
rename to include/freebsd/sys/malloc.h
diff --git a/include_bsd/sys/mbpool.h b/include/freebsd/sys/mbpool.h
similarity index 100%
rename from include_bsd/sys/mbpool.h
rename to include/freebsd/sys/mbpool.h
diff --git a/include_bsd/sys/mbuf.h b/include/freebsd/sys/mbuf.h
similarity index 100%
rename from include_bsd/sys/mbuf.h
rename to include/freebsd/sys/mbuf.h
diff --git a/include_bsd/sys/mchain.h b/include/freebsd/sys/mchain.h
similarity index 100%
rename from include_bsd/sys/mchain.h
rename to include/freebsd/sys/mchain.h
diff --git a/include_bsd/sys/md4.h b/include/freebsd/sys/md4.h
similarity index 100%
rename from include_bsd/sys/md4.h
rename to include/freebsd/sys/md4.h
diff --git a/include_bsd/sys/md5.h b/include/freebsd/sys/md5.h
similarity index 100%
rename from include_bsd/sys/md5.h
rename to include/freebsd/sys/md5.h
diff --git a/include_bsd/sys/mdioctl.h b/include/freebsd/sys/mdioctl.h
similarity index 100%
rename from include_bsd/sys/mdioctl.h
rename to include/freebsd/sys/mdioctl.h
diff --git a/include_bsd/sys/memdesc.h b/include/freebsd/sys/memdesc.h
similarity index 100%
rename from include_bsd/sys/memdesc.h
rename to include/freebsd/sys/memdesc.h
diff --git a/include_bsd/sys/memrange.h b/include/freebsd/sys/memrange.h
similarity index 100%
rename from include_bsd/sys/memrange.h
rename to include/freebsd/sys/memrange.h
diff --git a/include_bsd/sys/mman.h b/include/freebsd/sys/mman.h
similarity index 100%
rename from include_bsd/sys/mman.h
rename to include/freebsd/sys/mman.h
diff --git a/include_bsd/sys/module.h b/include/freebsd/sys/module.h
similarity index 100%
rename from include_bsd/sys/module.h
rename to include/freebsd/sys/module.h
diff --git a/include_bsd/sys/module_khelp.h b/include/freebsd/sys/module_khelp.h
similarity index 100%
rename from include_bsd/sys/module_khelp.h
rename to include/freebsd/sys/module_khelp.h
diff --git a/include_bsd/sys/mount.h b/include/freebsd/sys/mount.h
similarity index 100%
rename from include_bsd/sys/mount.h
rename to include/freebsd/sys/mount.h
diff --git a/include_bsd/sys/mouse.h b/include/freebsd/sys/mouse.h
similarity index 100%
rename from include_bsd/sys/mouse.h
rename to include/freebsd/sys/mouse.h
diff --git a/include_bsd/sys/mpt_ioctl.h b/include/freebsd/sys/mpt_ioctl.h
similarity index 100%
rename from include_bsd/sys/mpt_ioctl.h
rename to include/freebsd/sys/mpt_ioctl.h
diff --git a/include_bsd/sys/mqueue.h b/include/freebsd/sys/mqueue.h
similarity index 100%
rename from include_bsd/sys/mqueue.h
rename to include/freebsd/sys/mqueue.h
diff --git a/include_bsd/sys/msg.h b/include/freebsd/sys/msg.h
similarity index 100%
rename from include_bsd/sys/msg.h
rename to include/freebsd/sys/msg.h
diff --git a/include_bsd/sys/msgbuf.h b/include/freebsd/sys/msgbuf.h
similarity index 100%
rename from include_bsd/sys/msgbuf.h
rename to include/freebsd/sys/msgbuf.h
diff --git a/include_bsd/sys/mtio.h b/include/freebsd/sys/mtio.h
similarity index 100%
rename from include_bsd/sys/mtio.h
rename to include/freebsd/sys/mtio.h
diff --git a/include_bsd/sys/mutex.h b/include/freebsd/sys/mutex.h
similarity index 100%
rename from include_bsd/sys/mutex.h
rename to include/freebsd/sys/mutex.h
diff --git a/include_bsd/sys/namei.h b/include/freebsd/sys/namei.h
similarity index 100%
rename from include_bsd/sys/namei.h
rename to include/freebsd/sys/namei.h
diff --git a/include_bsd/sys/nlist_aout.h b/include/freebsd/sys/nlist_aout.h
similarity index 100%
rename from include_bsd/sys/nlist_aout.h
rename to include/freebsd/sys/nlist_aout.h
diff --git a/include_bsd/sys/numa.h b/include/freebsd/sys/numa.h
similarity index 100%
rename from include_bsd/sys/numa.h
rename to include/freebsd/sys/numa.h
diff --git a/include_bsd/sys/nv.h b/include/freebsd/sys/nv.h
similarity index 100%
rename from include_bsd/sys/nv.h
rename to include/freebsd/sys/nv.h
diff --git a/include_bsd/sys/osd.h b/include/freebsd/sys/osd.h
similarity index 100%
rename from include_bsd/sys/osd.h
rename to include/freebsd/sys/osd.h
diff --git a/include_bsd/sys/param.h b/include/freebsd/sys/param.h
similarity index 100%
rename from include_bsd/sys/param.h
rename to include/freebsd/sys/param.h
diff --git a/include_bsd/sys/pciio.h b/include/freebsd/sys/pciio.h
similarity index 100%
rename from include_bsd/sys/pciio.h
rename to include/freebsd/sys/pciio.h
diff --git a/include_bsd/sys/pcpu.h b/include/freebsd/sys/pcpu.h
similarity index 100%
rename from include_bsd/sys/pcpu.h
rename to include/freebsd/sys/pcpu.h
diff --git a/include_bsd/sys/pctrie.h b/include/freebsd/sys/pctrie.h
similarity index 100%
rename from include_bsd/sys/pctrie.h
rename to include/freebsd/sys/pctrie.h
diff --git a/include_bsd/sys/pioctl.h b/include/freebsd/sys/pioctl.h
similarity index 100%
rename from include_bsd/sys/pioctl.h
rename to include/freebsd/sys/pioctl.h
diff --git a/include_bsd/sys/pipe.h b/include/freebsd/sys/pipe.h
similarity index 100%
rename from include_bsd/sys/pipe.h
rename to include/freebsd/sys/pipe.h
diff --git a/include_bsd/sys/pmc.h b/include/freebsd/sys/pmc.h
similarity index 100%
rename from include_bsd/sys/pmc.h
rename to include/freebsd/sys/pmc.h
diff --git a/include_bsd/sys/pmckern.h b/include/freebsd/sys/pmckern.h
similarity index 100%
rename from include_bsd/sys/pmckern.h
rename to include/freebsd/sys/pmckern.h
diff --git a/include_bsd/sys/pmclog.h b/include/freebsd/sys/pmclog.h
similarity index 100%
rename from include_bsd/sys/pmclog.h
rename to include/freebsd/sys/pmclog.h
diff --git a/include_bsd/sys/poll.h b/include/freebsd/sys/poll.h
similarity index 100%
rename from include_bsd/sys/poll.h
rename to include/freebsd/sys/poll.h
diff --git a/include_bsd/sys/posix4.h b/include/freebsd/sys/posix4.h
similarity index 100%
rename from include_bsd/sys/posix4.h
rename to include/freebsd/sys/posix4.h
diff --git a/include_bsd/sys/power.h b/include/freebsd/sys/power.h
similarity index 100%
rename from include_bsd/sys/power.h
rename to include/freebsd/sys/power.h
diff --git a/include_bsd/sys/priority.h b/include/freebsd/sys/priority.h
similarity index 100%
rename from include_bsd/sys/priority.h
rename to include/freebsd/sys/priority.h
diff --git a/include_bsd/sys/priv.h b/include/freebsd/sys/priv.h
similarity index 100%
rename from include_bsd/sys/priv.h
rename to include/freebsd/sys/priv.h
diff --git a/include_bsd/sys/proc.h b/include/freebsd/sys/proc.h
similarity index 100%
rename from include_bsd/sys/proc.h
rename to include/freebsd/sys/proc.h
diff --git a/include_bsd/sys/procctl.h b/include/freebsd/sys/procctl.h
similarity index 100%
rename from include_bsd/sys/procctl.h
rename to include/freebsd/sys/procctl.h
diff --git a/include_bsd/sys/procdesc.h b/include/freebsd/sys/procdesc.h
similarity index 100%
rename from include_bsd/sys/procdesc.h
rename to include/freebsd/sys/procdesc.h
diff --git a/include_bsd/sys/procfs.h b/include/freebsd/sys/procfs.h
similarity index 100%
rename from include_bsd/sys/procfs.h
rename to include/freebsd/sys/procfs.h
diff --git a/include_bsd/sys/protosw.h b/include/freebsd/sys/protosw.h
similarity index 100%
rename from include_bsd/sys/protosw.h
rename to include/freebsd/sys/protosw.h
diff --git a/include_bsd/sys/ptio.h b/include/freebsd/sys/ptio.h
similarity index 100%
rename from include_bsd/sys/ptio.h
rename to include/freebsd/sys/ptio.h
diff --git a/include_bsd/sys/ptrace.h b/include/freebsd/sys/ptrace.h
similarity index 100%
rename from include_bsd/sys/ptrace.h
rename to include/freebsd/sys/ptrace.h
diff --git a/include_bsd/sys/queue.h b/include/freebsd/sys/queue.h
similarity index 100%
rename from include_bsd/sys/queue.h
rename to include/freebsd/sys/queue.h
diff --git a/include_bsd/sys/racct.h b/include/freebsd/sys/racct.h
similarity index 100%
rename from include_bsd/sys/racct.h
rename to include/freebsd/sys/racct.h
diff --git a/include_bsd/sys/random.h b/include/freebsd/sys/random.h
similarity index 100%
rename from include_bsd/sys/random.h
rename to include/freebsd/sys/random.h
diff --git a/include_bsd/sys/rangelock.h b/include/freebsd/sys/rangelock.h
similarity index 100%
rename from include_bsd/sys/rangelock.h
rename to include/freebsd/sys/rangelock.h
diff --git a/include_bsd/sys/rctl.h b/include/freebsd/sys/rctl.h
similarity index 100%
rename from include_bsd/sys/rctl.h
rename to include/freebsd/sys/rctl.h
diff --git a/include_bsd/sys/reboot.h b/include/freebsd/sys/reboot.h
similarity index 100%
rename from include_bsd/sys/reboot.h
rename to include/freebsd/sys/reboot.h
diff --git a/include_bsd/sys/refcount.h b/include/freebsd/sys/refcount.h
similarity index 100%
rename from include_bsd/sys/refcount.h
rename to include/freebsd/sys/refcount.h
diff --git a/include_bsd/sys/regression.h b/include/freebsd/sys/regression.h
similarity index 100%
rename from include_bsd/sys/regression.h
rename to include/freebsd/sys/regression.h
diff --git a/include_bsd/sys/resource.h b/include/freebsd/sys/resource.h
similarity index 100%
rename from include_bsd/sys/resource.h
rename to include/freebsd/sys/resource.h
diff --git a/include_bsd/sys/resourcevar.h b/include/freebsd/sys/resourcevar.h
similarity index 100%
rename from include_bsd/sys/resourcevar.h
rename to include/freebsd/sys/resourcevar.h
diff --git a/include_bsd/sys/rman.h b/include/freebsd/sys/rman.h
similarity index 100%
rename from include_bsd/sys/rman.h
rename to include/freebsd/sys/rman.h
diff --git a/include_bsd/sys/rmlock.h b/include/freebsd/sys/rmlock.h
similarity index 100%
rename from include_bsd/sys/rmlock.h
rename to include/freebsd/sys/rmlock.h
diff --git a/include_bsd/sys/rtprio.h b/include/freebsd/sys/rtprio.h
similarity index 100%
rename from include_bsd/sys/rtprio.h
rename to include/freebsd/sys/rtprio.h
diff --git a/include_bsd/sys/runq.h b/include/freebsd/sys/runq.h
similarity index 100%
rename from include_bsd/sys/runq.h
rename to include/freebsd/sys/runq.h
diff --git a/include_bsd/sys/rwlock.h b/include/freebsd/sys/rwlock.h
similarity index 100%
rename from include_bsd/sys/rwlock.h
rename to include/freebsd/sys/rwlock.h
diff --git a/include_bsd/sys/sbuf.h b/include/freebsd/sys/sbuf.h
similarity index 100%
rename from include_bsd/sys/sbuf.h
rename to include/freebsd/sys/sbuf.h
diff --git a/include_bsd/sys/sched.h b/include/freebsd/sys/sched.h
similarity index 100%
rename from include_bsd/sys/sched.h
rename to include/freebsd/sys/sched.h
diff --git a/include_bsd/sys/sdt.h b/include/freebsd/sys/sdt.h
similarity index 100%
rename from include_bsd/sys/sdt.h
rename to include/freebsd/sys/sdt.h
diff --git a/include_bsd/sys/select.h b/include/freebsd/sys/select.h
similarity index 100%
rename from include_bsd/sys/select.h
rename to include/freebsd/sys/select.h
diff --git a/include_bsd/sys/selinfo.h b/include/freebsd/sys/selinfo.h
similarity index 100%
rename from include_bsd/sys/selinfo.h
rename to include/freebsd/sys/selinfo.h
diff --git a/include_bsd/sys/sem.h b/include/freebsd/sys/sem.h
similarity index 100%
rename from include_bsd/sys/sem.h
rename to include/freebsd/sys/sem.h
diff --git a/include_bsd/sys/sema.h b/include/freebsd/sys/sema.h
similarity index 100%
rename from include_bsd/sys/sema.h
rename to include/freebsd/sys/sema.h
diff --git a/include_bsd/sys/seq.h b/include/freebsd/sys/seq.h
similarity index 100%
rename from include_bsd/sys/seq.h
rename to include/freebsd/sys/seq.h
diff --git a/include_bsd/sys/serial.h b/include/freebsd/sys/serial.h
similarity index 100%
rename from include_bsd/sys/serial.h
rename to include/freebsd/sys/serial.h
diff --git a/include_bsd/sys/sf_buf.h b/include/freebsd/sys/sf_buf.h
similarity index 100%
rename from include_bsd/sys/sf_buf.h
rename to include/freebsd/sys/sf_buf.h
diff --git a/include_bsd/sys/sglist.h b/include/freebsd/sys/sglist.h
similarity index 100%
rename from include_bsd/sys/sglist.h
rename to include/freebsd/sys/sglist.h
diff --git a/include_bsd/sys/shm.h b/include/freebsd/sys/shm.h
similarity index 100%
rename from include_bsd/sys/shm.h
rename to include/freebsd/sys/shm.h
diff --git a/include_bsd/sys/sigio.h b/include/freebsd/sys/sigio.h
similarity index 100%
rename from include_bsd/sys/sigio.h
rename to include/freebsd/sys/sigio.h
diff --git a/include_bsd/sys/signal.h b/include/freebsd/sys/signal.h
similarity index 100%
rename from include_bsd/sys/signal.h
rename to include/freebsd/sys/signal.h
diff --git a/include_bsd/sys/signalvar.h b/include/freebsd/sys/signalvar.h
similarity index 100%
rename from include_bsd/sys/signalvar.h
rename to include/freebsd/sys/signalvar.h
diff --git a/include_bsd/sys/sleepqueue.h b/include/freebsd/sys/sleepqueue.h
similarity index 100%
rename from include_bsd/sys/sleepqueue.h
rename to include/freebsd/sys/sleepqueue.h
diff --git a/include_bsd/sys/slicer.h b/include/freebsd/sys/slicer.h
similarity index 100%
rename from include_bsd/sys/slicer.h
rename to include/freebsd/sys/slicer.h
diff --git a/include_bsd/sys/smp.h b/include/freebsd/sys/smp.h
similarity index 100%
rename from include_bsd/sys/smp.h
rename to include/freebsd/sys/smp.h
diff --git a/include_bsd/sys/snoop.h b/include/freebsd/sys/snoop.h
similarity index 100%
rename from include_bsd/sys/snoop.h
rename to include/freebsd/sys/snoop.h
diff --git a/include_bsd/sys/sockbuf.h b/include/freebsd/sys/sockbuf.h
similarity index 100%
rename from include_bsd/sys/sockbuf.h
rename to include/freebsd/sys/sockbuf.h
diff --git a/include_bsd/sys/socket.h b/include/freebsd/sys/socket.h
similarity index 100%
rename from include_bsd/sys/socket.h
rename to include/freebsd/sys/socket.h
diff --git a/include_bsd/sys/socketvar.h b/include/freebsd/sys/socketvar.h
similarity index 100%
rename from include_bsd/sys/socketvar.h
rename to include/freebsd/sys/socketvar.h
diff --git a/include_bsd/sys/sockio.h b/include/freebsd/sys/sockio.h
similarity index 100%
rename from include_bsd/sys/sockio.h
rename to include/freebsd/sys/sockio.h
diff --git a/include_bsd/sys/sockopt.h b/include/freebsd/sys/sockopt.h
similarity index 100%
rename from include_bsd/sys/sockopt.h
rename to include/freebsd/sys/sockopt.h
diff --git a/include_bsd/sys/sockstate.h b/include/freebsd/sys/sockstate.h
similarity index 100%
rename from include_bsd/sys/sockstate.h
rename to include/freebsd/sys/sockstate.h
diff --git a/include_bsd/sys/soundcard.h b/include/freebsd/sys/soundcard.h
similarity index 100%
rename from include_bsd/sys/soundcard.h
rename to include/freebsd/sys/soundcard.h
diff --git a/include_bsd/sys/spigenio.h b/include/freebsd/sys/spigenio.h
similarity index 100%
rename from include_bsd/sys/spigenio.h
rename to include/freebsd/sys/spigenio.h
diff --git a/include_bsd/sys/stack.h b/include/freebsd/sys/stack.h
similarity index 100%
rename from include_bsd/sys/stack.h
rename to include/freebsd/sys/stack.h
diff --git a/include_bsd/sys/stat.h b/include/freebsd/sys/stat.h
similarity index 100%
rename from include_bsd/sys/stat.h
rename to include/freebsd/sys/stat.h
diff --git a/include_bsd/sys/statvfs.h b/include/freebsd/sys/statvfs.h
similarity index 100%
rename from include_bsd/sys/statvfs.h
rename to include/freebsd/sys/statvfs.h
diff --git a/include_bsd/sys/stdatomic.h b/include/freebsd/sys/stdatomic.h
similarity index 100%
rename from include_bsd/sys/stdatomic.h
rename to include/freebsd/sys/stdatomic.h
diff --git a/include_bsd/sys/stddef.h b/include/freebsd/sys/stddef.h
similarity index 100%
rename from include_bsd/sys/stddef.h
rename to include/freebsd/sys/stddef.h
diff --git a/include_bsd/sys/stdint.h b/include/freebsd/sys/stdint.h
similarity index 100%
rename from include_bsd/sys/stdint.h
rename to include/freebsd/sys/stdint.h
diff --git a/include_bsd/sys/sun_disklabel.h b/include/freebsd/sys/sun_disklabel.h
similarity index 100%
rename from include_bsd/sys/sun_disklabel.h
rename to include/freebsd/sys/sun_disklabel.h
diff --git a/include_bsd/sys/sx.h b/include/freebsd/sys/sx.h
similarity index 100%
rename from include_bsd/sys/sx.h
rename to include/freebsd/sys/sx.h
diff --git a/include_bsd/sys/syscall.h b/include/freebsd/sys/syscall.h
similarity index 100%
rename from include_bsd/sys/syscall.h
rename to include/freebsd/sys/syscall.h
diff --git a/include_bsd/sys/syscallsubr.h b/include/freebsd/sys/syscallsubr.h
similarity index 100%
rename from include_bsd/sys/syscallsubr.h
rename to include/freebsd/sys/syscallsubr.h
diff --git a/include_bsd/sys/sysctl.h b/include/freebsd/sys/sysctl.h
similarity index 100%
rename from include_bsd/sys/sysctl.h
rename to include/freebsd/sys/sysctl.h
diff --git a/include_bsd/sys/sysent.h b/include/freebsd/sys/sysent.h
similarity index 100%
rename from include_bsd/sys/sysent.h
rename to include/freebsd/sys/sysent.h
diff --git a/include_bsd/sys/syslimits.h b/include/freebsd/sys/syslimits.h
similarity index 100%
rename from include_bsd/sys/syslimits.h
rename to include/freebsd/sys/syslimits.h
diff --git a/include_bsd/sys/syslog.h b/include/freebsd/sys/syslog.h
similarity index 100%
rename from include_bsd/sys/syslog.h
rename to include/freebsd/sys/syslog.h
diff --git a/include_bsd/sys/sysproto.h b/include/freebsd/sys/sysproto.h
similarity index 100%
rename from include_bsd/sys/sysproto.h
rename to include/freebsd/sys/sysproto.h
diff --git a/include_bsd/sys/systm.h b/include/freebsd/sys/systm.h
similarity index 100%
rename from include_bsd/sys/systm.h
rename to include/freebsd/sys/systm.h
diff --git a/include_bsd/sys/taskqueue.h b/include/freebsd/sys/taskqueue.h
similarity index 100%
rename from include_bsd/sys/taskqueue.h
rename to include/freebsd/sys/taskqueue.h
diff --git a/include_bsd/sys/terminal.h b/include/freebsd/sys/terminal.h
similarity index 100%
rename from include_bsd/sys/terminal.h
rename to include/freebsd/sys/terminal.h
diff --git a/include_bsd/sys/termios.h b/include/freebsd/sys/termios.h
similarity index 100%
rename from include_bsd/sys/termios.h
rename to include/freebsd/sys/termios.h
diff --git a/include_bsd/sys/thr.h b/include/freebsd/sys/thr.h
similarity index 100%
rename from include_bsd/sys/thr.h
rename to include/freebsd/sys/thr.h
diff --git a/include_bsd/sys/tiio.h b/include/freebsd/sys/tiio.h
similarity index 100%
rename from include_bsd/sys/tiio.h
rename to include/freebsd/sys/tiio.h
diff --git a/include_bsd/sys/time.h b/include/freebsd/sys/time.h
similarity index 100%
rename from include_bsd/sys/time.h
rename to include/freebsd/sys/time.h
diff --git a/include_bsd/sys/timeb.h b/include/freebsd/sys/timeb.h
similarity index 100%
rename from include_bsd/sys/timeb.h
rename to include/freebsd/sys/timeb.h
diff --git a/include_bsd/sys/timeet.h b/include/freebsd/sys/timeet.h
similarity index 100%
rename from include_bsd/sys/timeet.h
rename to include/freebsd/sys/timeet.h
diff --git a/include_bsd/sys/timeffc.h b/include/freebsd/sys/timeffc.h
similarity index 100%
rename from include_bsd/sys/timeffc.h
rename to include/freebsd/sys/timeffc.h
diff --git a/include_bsd/sys/timepps.h b/include/freebsd/sys/timepps.h
similarity index 100%
rename from include_bsd/sys/timepps.h
rename to include/freebsd/sys/timepps.h
diff --git a/include_bsd/sys/timers.h b/include/freebsd/sys/timers.h
similarity index 100%
rename from include_bsd/sys/timers.h
rename to include/freebsd/sys/timers.h
diff --git a/include_bsd/sys/times.h b/include/freebsd/sys/times.h
similarity index 100%
rename from include_bsd/sys/times.h
rename to include/freebsd/sys/times.h
diff --git a/include_bsd/sys/timespec.h b/include/freebsd/sys/timespec.h
similarity index 100%
rename from include_bsd/sys/timespec.h
rename to include/freebsd/sys/timespec.h
diff --git a/include_bsd/sys/timetc.h b/include/freebsd/sys/timetc.h
similarity index 100%
rename from include_bsd/sys/timetc.h
rename to include/freebsd/sys/timetc.h
diff --git a/include_bsd/sys/timex.h b/include/freebsd/sys/timex.h
similarity index 100%
rename from include_bsd/sys/timex.h
rename to include/freebsd/sys/timex.h
diff --git a/include_bsd/sys/tree.h b/include/freebsd/sys/tree.h
similarity index 100%
rename from include_bsd/sys/tree.h
rename to include/freebsd/sys/tree.h
diff --git a/include_bsd/sys/tty.h b/include/freebsd/sys/tty.h
similarity index 100%
rename from include_bsd/sys/tty.h
rename to include/freebsd/sys/tty.h
diff --git a/include_bsd/sys/ttycom.h b/include/freebsd/sys/ttycom.h
similarity index 100%
rename from include_bsd/sys/ttycom.h
rename to include/freebsd/sys/ttycom.h
diff --git a/include_bsd/sys/ttydefaults.h b/include/freebsd/sys/ttydefaults.h
similarity index 100%
rename from include_bsd/sys/ttydefaults.h
rename to include/freebsd/sys/ttydefaults.h
diff --git a/include_bsd/sys/ttydevsw.h b/include/freebsd/sys/ttydevsw.h
similarity index 100%
rename from include_bsd/sys/ttydevsw.h
rename to include/freebsd/sys/ttydevsw.h
diff --git a/include_bsd/sys/ttydisc.h b/include/freebsd/sys/ttydisc.h
similarity index 100%
rename from include_bsd/sys/ttydisc.h
rename to include/freebsd/sys/ttydisc.h
diff --git a/include_bsd/sys/ttyhook.h b/include/freebsd/sys/ttyhook.h
similarity index 100%
rename from include_bsd/sys/ttyhook.h
rename to include/freebsd/sys/ttyhook.h
diff --git a/include_bsd/sys/ttyqueue.h b/include/freebsd/sys/ttyqueue.h
similarity index 100%
rename from include_bsd/sys/ttyqueue.h
rename to include/freebsd/sys/ttyqueue.h
diff --git a/include_bsd/sys/turnstile.h b/include/freebsd/sys/turnstile.h
similarity index 100%
rename from include_bsd/sys/turnstile.h
rename to include/freebsd/sys/turnstile.h
diff --git a/include_bsd/sys/types.h b/include/freebsd/sys/types.h
similarity index 100%
rename from include_bsd/sys/types.h
rename to include/freebsd/sys/types.h
diff --git a/include_bsd/sys/ucontext.h b/include/freebsd/sys/ucontext.h
similarity index 100%
rename from include_bsd/sys/ucontext.h
rename to include/freebsd/sys/ucontext.h
diff --git a/include_bsd/sys/ucred.h b/include/freebsd/sys/ucred.h
similarity index 100%
rename from include_bsd/sys/ucred.h
rename to include/freebsd/sys/ucred.h
diff --git a/include_bsd/sys/uio.h b/include/freebsd/sys/uio.h
similarity index 100%
rename from include_bsd/sys/uio.h
rename to include/freebsd/sys/uio.h
diff --git a/include_bsd/sys/umtx.h b/include/freebsd/sys/umtx.h
similarity index 100%
rename from include_bsd/sys/umtx.h
rename to include/freebsd/sys/umtx.h
diff --git a/include_bsd/sys/un.h b/include/freebsd/sys/un.h
similarity index 100%
rename from include_bsd/sys/un.h
rename to include/freebsd/sys/un.h
diff --git a/include_bsd/sys/unistd.h b/include/freebsd/sys/unistd.h
similarity index 100%
rename from include_bsd/sys/unistd.h
rename to include/freebsd/sys/unistd.h
diff --git a/include_bsd/sys/unpcb.h b/include/freebsd/sys/unpcb.h
similarity index 100%
rename from include_bsd/sys/unpcb.h
rename to include/freebsd/sys/unpcb.h
diff --git a/include_bsd/sys/user.h b/include/freebsd/sys/user.h
similarity index 100%
rename from include_bsd/sys/user.h
rename to include/freebsd/sys/user.h
diff --git a/include_bsd/sys/utsname.h b/include/freebsd/sys/utsname.h
similarity index 100%
rename from include_bsd/sys/utsname.h
rename to include/freebsd/sys/utsname.h
diff --git a/include_bsd/sys/uuid.h b/include/freebsd/sys/uuid.h
similarity index 100%
rename from include_bsd/sys/uuid.h
rename to include/freebsd/sys/uuid.h
diff --git a/include_bsd/sys/vdso.h b/include/freebsd/sys/vdso.h
similarity index 100%
rename from include_bsd/sys/vdso.h
rename to include/freebsd/sys/vdso.h
diff --git a/include_bsd/sys/vmem.h b/include/freebsd/sys/vmem.h
similarity index 100%
rename from include_bsd/sys/vmem.h
rename to include/freebsd/sys/vmem.h
diff --git a/include_bsd/sys/vmmeter.h b/include/freebsd/sys/vmmeter.h
similarity index 100%
rename from include_bsd/sys/vmmeter.h
rename to include/freebsd/sys/vmmeter.h
diff --git a/include_bsd/sys/vnode.h b/include/freebsd/sys/vnode.h
similarity index 100%
rename from include_bsd/sys/vnode.h
rename to include/freebsd/sys/vnode.h
diff --git a/include_bsd/sys/vtoc.h b/include/freebsd/sys/vtoc.h
similarity index 100%
rename from include_bsd/sys/vtoc.h
rename to include/freebsd/sys/vtoc.h
diff --git a/include_bsd/sys/wait.h b/include/freebsd/sys/wait.h
similarity index 100%
rename from include_bsd/sys/wait.h
rename to include/freebsd/sys/wait.h
diff --git a/include_bsd/sys/watchdog.h b/include/freebsd/sys/watchdog.h
similarity index 100%
rename from include_bsd/sys/watchdog.h
rename to include/freebsd/sys/watchdog.h
diff --git a/include_bsd/sys/zlib.h b/include/freebsd/sys/zlib.h
similarity index 100%
rename from include_bsd/sys/zlib.h
rename to include/freebsd/sys/zlib.h
diff --git a/include_bsd/sys/zutil.h b/include/freebsd/sys/zutil.h
similarity index 100%
rename from include_bsd/sys/zutil.h
rename to include/freebsd/sys/zutil.h
diff --git a/include_bsd/sysdecode.h b/include/freebsd/sysdecode.h
similarity index 100%
rename from include_bsd/sysdecode.h
rename to include/freebsd/sysdecode.h
diff --git a/include_bsd/sysexits.h b/include/freebsd/sysexits.h
similarity index 100%
rename from include_bsd/sysexits.h
rename to include/freebsd/sysexits.h
diff --git a/include_bsd/syslog.h b/include/freebsd/syslog.h
similarity index 100%
rename from include_bsd/syslog.h
rename to include/freebsd/syslog.h
diff --git a/include_bsd/taclib.h b/include/freebsd/taclib.h
similarity index 100%
rename from include_bsd/taclib.h
rename to include/freebsd/taclib.h
diff --git a/include_bsd/tar.h b/include/freebsd/tar.h
similarity index 100%
rename from include_bsd/tar.h
rename to include/freebsd/tar.h
diff --git a/include_bsd/tcpd.h b/include/freebsd/tcpd.h
similarity index 100%
rename from include_bsd/tcpd.h
rename to include/freebsd/tcpd.h
diff --git a/include_bsd/teken/teken.h b/include/freebsd/teken/teken.h
similarity index 100%
rename from include_bsd/teken/teken.h
rename to include/freebsd/teken/teken.h
diff --git a/include_bsd/term.h b/include/freebsd/term.h
similarity index 100%
rename from include_bsd/term.h
rename to include/freebsd/term.h
diff --git a/include_bsd/termcap.h b/include/freebsd/termcap.h
similarity index 100%
rename from include_bsd/termcap.h
rename to include/freebsd/termcap.h
diff --git a/include_bsd/termios.h b/include/freebsd/termios.h
similarity index 100%
rename from include_bsd/termios.h
rename to include/freebsd/termios.h
diff --git a/include_bsd/tgmath.h b/include/freebsd/tgmath.h
similarity index 100%
rename from include_bsd/tgmath.h
rename to include/freebsd/tgmath.h
diff --git a/include_bsd/thread_db.h b/include/freebsd/thread_db.h
similarity index 100%
rename from include_bsd/thread_db.h
rename to include/freebsd/thread_db.h
diff --git a/include_bsd/threads.h b/include/freebsd/threads.h
similarity index 100%
rename from include_bsd/threads.h
rename to include/freebsd/threads.h
diff --git a/include_bsd/time.h b/include/freebsd/time.h
similarity index 100%
rename from include_bsd/time.h
rename to include/freebsd/time.h
diff --git a/include_bsd/timeconv.h b/include/freebsd/timeconv.h
similarity index 100%
rename from include_bsd/timeconv.h
rename to include/freebsd/timeconv.h
diff --git a/include_bsd/timers.h b/include/freebsd/timers.h
similarity index 100%
rename from include_bsd/timers.h
rename to include/freebsd/timers.h
diff --git a/include_bsd/ttyent.h b/include/freebsd/ttyent.h
similarity index 100%
rename from include_bsd/ttyent.h
rename to include/freebsd/ttyent.h
diff --git a/include_bsd/uchar.h b/include/freebsd/uchar.h
similarity index 100%
rename from include_bsd/uchar.h
rename to include/freebsd/uchar.h
diff --git a/include_bsd/ucontext.h b/include/freebsd/ucontext.h
similarity index 100%
rename from include_bsd/ucontext.h
rename to include/freebsd/ucontext.h
diff --git a/include_bsd/ufs/ffs/ffs_extern.h b/include/freebsd/ufs/ffs/ffs_extern.h
similarity index 100%
rename from include_bsd/ufs/ffs/ffs_extern.h
rename to include/freebsd/ufs/ffs/ffs_extern.h
diff --git a/include_bsd/ufs/ffs/fs.h b/include/freebsd/ufs/ffs/fs.h
similarity index 100%
rename from include_bsd/ufs/ffs/fs.h
rename to include/freebsd/ufs/ffs/fs.h
diff --git a/include_bsd/ufs/ffs/softdep.h b/include/freebsd/ufs/ffs/softdep.h
similarity index 100%
rename from include_bsd/ufs/ffs/softdep.h
rename to include/freebsd/ufs/ffs/softdep.h
diff --git a/include_bsd/ufs/ufs/acl.h b/include/freebsd/ufs/ufs/acl.h
similarity index 100%
rename from include_bsd/ufs/ufs/acl.h
rename to include/freebsd/ufs/ufs/acl.h
diff --git a/include_bsd/ufs/ufs/dinode.h b/include/freebsd/ufs/ufs/dinode.h
similarity index 100%
rename from include_bsd/ufs/ufs/dinode.h
rename to include/freebsd/ufs/ufs/dinode.h
diff --git a/include_bsd/ufs/ufs/dir.h b/include/freebsd/ufs/ufs/dir.h
similarity index 100%
rename from include_bsd/ufs/ufs/dir.h
rename to include/freebsd/ufs/ufs/dir.h
diff --git a/include_bsd/ufs/ufs/dirhash.h b/include/freebsd/ufs/ufs/dirhash.h
similarity index 100%
rename from include_bsd/ufs/ufs/dirhash.h
rename to include/freebsd/ufs/ufs/dirhash.h
diff --git a/include_bsd/ufs/ufs/extattr.h b/include/freebsd/ufs/ufs/extattr.h
similarity index 100%
rename from include_bsd/ufs/ufs/extattr.h
rename to include/freebsd/ufs/ufs/extattr.h
diff --git a/include_bsd/ufs/ufs/gjournal.h b/include/freebsd/ufs/ufs/gjournal.h
similarity index 100%
rename from include_bsd/ufs/ufs/gjournal.h
rename to include/freebsd/ufs/ufs/gjournal.h
diff --git a/include_bsd/ufs/ufs/inode.h b/include/freebsd/ufs/ufs/inode.h
similarity index 100%
rename from include_bsd/ufs/ufs/inode.h
rename to include/freebsd/ufs/ufs/inode.h
diff --git a/include_bsd/ufs/ufs/quota.h b/include/freebsd/ufs/ufs/quota.h
similarity index 100%
rename from include_bsd/ufs/ufs/quota.h
rename to include/freebsd/ufs/ufs/quota.h
diff --git a/include_bsd/ufs/ufs/ufs_extern.h b/include/freebsd/ufs/ufs/ufs_extern.h
similarity index 100%
rename from include_bsd/ufs/ufs/ufs_extern.h
rename to include/freebsd/ufs/ufs/ufs_extern.h
diff --git a/include_bsd/ufs/ufs/ufsmount.h b/include/freebsd/ufs/ufs/ufsmount.h
similarity index 100%
rename from include_bsd/ufs/ufs/ufsmount.h
rename to include/freebsd/ufs/ufs/ufsmount.h
diff --git a/include_bsd/ugidfw.h b/include/freebsd/ugidfw.h
similarity index 100%
rename from include_bsd/ugidfw.h
rename to include/freebsd/ugidfw.h
diff --git a/include_bsd/ulimit.h b/include/freebsd/ulimit.h
similarity index 100%
rename from include_bsd/ulimit.h
rename to include/freebsd/ulimit.h
diff --git a/include_bsd/ulog.h b/include/freebsd/ulog.h
similarity index 100%
rename from include_bsd/ulog.h
rename to include/freebsd/ulog.h
diff --git a/include_bsd/unctrl.h b/include/freebsd/unctrl.h
similarity index 100%
rename from include_bsd/unctrl.h
rename to include/freebsd/unctrl.h
diff --git a/include_bsd/unistd.h b/include/freebsd/unistd.h
similarity index 100%
rename from include_bsd/unistd.h
rename to include/freebsd/unistd.h
diff --git a/include_bsd/usb.h b/include/freebsd/usb.h
similarity index 100%
rename from include_bsd/usb.h
rename to include/freebsd/usb.h
diff --git a/include_bsd/usbhid.h b/include/freebsd/usbhid.h
similarity index 100%
rename from include_bsd/usbhid.h
rename to include/freebsd/usbhid.h
diff --git a/include_bsd/utempter.h b/include/freebsd/utempter.h
similarity index 100%
rename from include_bsd/utempter.h
rename to include/freebsd/utempter.h
diff --git a/include_bsd/utime.h b/include/freebsd/utime.h
similarity index 100%
rename from include_bsd/utime.h
rename to include/freebsd/utime.h
diff --git a/include_bsd/utmpx.h b/include/freebsd/utmpx.h
similarity index 100%
rename from include_bsd/utmpx.h
rename to include/freebsd/utmpx.h
diff --git a/include_bsd/uuid.h b/include/freebsd/uuid.h
similarity index 100%
rename from include_bsd/uuid.h
rename to include/freebsd/uuid.h
diff --git a/include_bsd/varargs.h b/include/freebsd/varargs.h
similarity index 100%
rename from include_bsd/varargs.h
rename to include/freebsd/varargs.h
diff --git a/include_bsd/vgl.h b/include/freebsd/vgl.h
similarity index 100%
rename from include_bsd/vgl.h
rename to include/freebsd/vgl.h
diff --git a/include_bsd/vis.h b/include/freebsd/vis.h
similarity index 100%
rename from include_bsd/vis.h
rename to include/freebsd/vis.h
diff --git a/include_bsd/vm/_vm_radix.h b/include/freebsd/vm/_vm_radix.h
similarity index 100%
rename from include_bsd/vm/_vm_radix.h
rename to include/freebsd/vm/_vm_radix.h
diff --git a/include_bsd/vm/memguard.h b/include/freebsd/vm/memguard.h
similarity index 100%
rename from include_bsd/vm/memguard.h
rename to include/freebsd/vm/memguard.h
diff --git a/include_bsd/vm/pmap.h b/include/freebsd/vm/pmap.h
similarity index 100%
rename from include_bsd/vm/pmap.h
rename to include/freebsd/vm/pmap.h
diff --git a/include_bsd/vm/redzone.h b/include/freebsd/vm/redzone.h
similarity index 100%
rename from include_bsd/vm/redzone.h
rename to include/freebsd/vm/redzone.h
diff --git a/include_bsd/vm/swap_pager.h b/include/freebsd/vm/swap_pager.h
similarity index 100%
rename from include_bsd/vm/swap_pager.h
rename to include/freebsd/vm/swap_pager.h
diff --git a/include_bsd/vm/uma.h b/include/freebsd/vm/uma.h
similarity index 100%
rename from include_bsd/vm/uma.h
rename to include/freebsd/vm/uma.h
diff --git a/include_bsd/vm/uma_dbg.h b/include/freebsd/vm/uma_dbg.h
similarity index 100%
rename from include_bsd/vm/uma_dbg.h
rename to include/freebsd/vm/uma_dbg.h
diff --git a/include_bsd/vm/uma_int.h b/include/freebsd/vm/uma_int.h
similarity index 100%
rename from include_bsd/vm/uma_int.h
rename to include/freebsd/vm/uma_int.h
diff --git a/include_bsd/vm/vm.h b/include/freebsd/vm/vm.h
similarity index 100%
rename from include_bsd/vm/vm.h
rename to include/freebsd/vm/vm.h
diff --git a/include_bsd/vm/vm_domain.h b/include/freebsd/vm/vm_domain.h
similarity index 100%
rename from include_bsd/vm/vm_domain.h
rename to include/freebsd/vm/vm_domain.h
diff --git a/include_bsd/vm/vm_extern.h b/include/freebsd/vm/vm_extern.h
similarity index 100%
rename from include_bsd/vm/vm_extern.h
rename to include/freebsd/vm/vm_extern.h
diff --git a/include_bsd/vm/vm_kern.h b/include/freebsd/vm/vm_kern.h
similarity index 100%
rename from include_bsd/vm/vm_kern.h
rename to include/freebsd/vm/vm_kern.h
diff --git a/include_bsd/vm/vm_map.h b/include/freebsd/vm/vm_map.h
similarity index 100%
rename from include_bsd/vm/vm_map.h
rename to include/freebsd/vm/vm_map.h
diff --git a/include_bsd/vm/vm_object.h b/include/freebsd/vm/vm_object.h
similarity index 100%
rename from include_bsd/vm/vm_object.h
rename to include/freebsd/vm/vm_object.h
diff --git a/include_bsd/vm/vm_page.h b/include/freebsd/vm/vm_page.h
similarity index 100%
rename from include_bsd/vm/vm_page.h
rename to include/freebsd/vm/vm_page.h
diff --git a/include_bsd/vm/vm_pageout.h b/include/freebsd/vm/vm_pageout.h
similarity index 100%
rename from include_bsd/vm/vm_pageout.h
rename to include/freebsd/vm/vm_pageout.h
diff --git a/include_bsd/vm/vm_pager.h b/include/freebsd/vm/vm_pager.h
similarity index 100%
rename from include_bsd/vm/vm_pager.h
rename to include/freebsd/vm/vm_pager.h
diff --git a/include_bsd/vm/vm_param.h b/include/freebsd/vm/vm_param.h
similarity index 100%
rename from include_bsd/vm/vm_param.h
rename to include/freebsd/vm/vm_param.h
diff --git a/include_bsd/vm/vm_phys.h b/include/freebsd/vm/vm_phys.h
similarity index 100%
rename from include_bsd/vm/vm_phys.h
rename to include/freebsd/vm/vm_phys.h
diff --git a/include_bsd/vm/vm_radix.h b/include/freebsd/vm/vm_radix.h
similarity index 100%
rename from include_bsd/vm/vm_radix.h
rename to include/freebsd/vm/vm_radix.h
diff --git a/include_bsd/vm/vm_reserv.h b/include/freebsd/vm/vm_reserv.h
similarity index 100%
rename from include_bsd/vm/vm_reserv.h
rename to include/freebsd/vm/vm_reserv.h
diff --git a/include_bsd/vm/vnode_pager.h b/include/freebsd/vm/vnode_pager.h
similarity index 100%
rename from include_bsd/vm/vnode_pager.h
rename to include/freebsd/vm/vnode_pager.h
diff --git a/include_bsd/vmmapi.h b/include/freebsd/vmmapi.h
similarity index 100%
rename from include_bsd/vmmapi.h
rename to include/freebsd/vmmapi.h
diff --git a/include_bsd/wchar.h b/include/freebsd/wchar.h
similarity index 100%
rename from include_bsd/wchar.h
rename to include/freebsd/wchar.h
diff --git a/include_bsd/wctype.h b/include/freebsd/wctype.h
similarity index 100%
rename from include_bsd/wctype.h
rename to include/freebsd/wctype.h
diff --git a/include_bsd/wind.h b/include/freebsd/wind.h
similarity index 100%
rename from include_bsd/wind.h
rename to include/freebsd/wind.h
diff --git a/include_bsd/wind_err.h b/include/freebsd/wind_err.h
similarity index 100%
rename from include_bsd/wind_err.h
rename to include/freebsd/wind_err.h
diff --git a/include_bsd/wordexp.h b/include/freebsd/wordexp.h
similarity index 100%
rename from include_bsd/wordexp.h
rename to include/freebsd/wordexp.h
diff --git a/include_bsd/x86/_align.h b/include/freebsd/x86/_align.h
similarity index 100%
rename from include_bsd/x86/_align.h
rename to include/freebsd/x86/_align.h
diff --git a/include_bsd/x86/_inttypes.h b/include/freebsd/x86/_inttypes.h
similarity index 100%
rename from include_bsd/x86/_inttypes.h
rename to include/freebsd/x86/_inttypes.h
diff --git a/include_bsd/x86/_limits.h b/include/freebsd/x86/_limits.h
similarity index 100%
rename from include_bsd/x86/_limits.h
rename to include/freebsd/x86/_limits.h
diff --git a/include_bsd/x86/_stdint.h b/include/freebsd/x86/_stdint.h
similarity index 100%
rename from include_bsd/x86/_stdint.h
rename to include/freebsd/x86/_stdint.h
diff --git a/include_bsd/x86/_types.h b/include/freebsd/x86/_types.h
similarity index 100%
rename from include_bsd/x86/_types.h
rename to include/freebsd/x86/_types.h
diff --git a/include_bsd/x86/acpica_machdep.h b/include/freebsd/x86/acpica_machdep.h
similarity index 100%
rename from include_bsd/x86/acpica_machdep.h
rename to include/freebsd/x86/acpica_machdep.h
diff --git a/include_bsd/x86/apicreg.h b/include/freebsd/x86/apicreg.h
similarity index 100%
rename from include_bsd/x86/apicreg.h
rename to include/freebsd/x86/apicreg.h
diff --git a/include_bsd/x86/apicvar.h b/include/freebsd/x86/apicvar.h
similarity index 100%
rename from include_bsd/x86/apicvar.h
rename to include/freebsd/x86/apicvar.h
diff --git a/include_bsd/x86/apm_bios.h b/include/freebsd/x86/apm_bios.h
similarity index 100%
rename from include_bsd/x86/apm_bios.h
rename to include/freebsd/x86/apm_bios.h
diff --git a/include_bsd/x86/bus.h b/include/freebsd/x86/bus.h
similarity index 100%
rename from include_bsd/x86/bus.h
rename to include/freebsd/x86/bus.h
diff --git a/include_bsd/x86/busdma_impl.h b/include/freebsd/x86/busdma_impl.h
similarity index 100%
rename from include_bsd/x86/busdma_impl.h
rename to include/freebsd/x86/busdma_impl.h
diff --git a/include_bsd/x86/cputypes.h b/include/freebsd/x86/cputypes.h
similarity index 100%
rename from include_bsd/x86/cputypes.h
rename to include/freebsd/x86/cputypes.h
diff --git a/include_bsd/x86/dump.h b/include/freebsd/x86/dump.h
similarity index 100%
rename from include_bsd/x86/dump.h
rename to include/freebsd/x86/dump.h
diff --git a/include_bsd/x86/elf.h b/include/freebsd/x86/elf.h
similarity index 100%
rename from include_bsd/x86/elf.h
rename to include/freebsd/x86/elf.h
diff --git a/include_bsd/x86/endian.h b/include/freebsd/x86/endian.h
similarity index 100%
rename from include_bsd/x86/endian.h
rename to include/freebsd/x86/endian.h
diff --git a/include_bsd/x86/fdt.h b/include/freebsd/x86/fdt.h
similarity index 100%
rename from include_bsd/x86/fdt.h
rename to include/freebsd/x86/fdt.h
diff --git a/include_bsd/x86/float.h b/include/freebsd/x86/float.h
similarity index 100%
rename from include_bsd/x86/float.h
rename to include/freebsd/x86/float.h
diff --git a/include_bsd/x86/fpu.h b/include/freebsd/x86/fpu.h
similarity index 100%
rename from include_bsd/x86/fpu.h
rename to include/freebsd/x86/fpu.h
diff --git a/include_bsd/x86/frame.h b/include/freebsd/x86/frame.h
similarity index 100%
rename from include_bsd/x86/frame.h
rename to include/freebsd/x86/frame.h
diff --git a/include_bsd/x86/init.h b/include/freebsd/x86/init.h
similarity index 100%
rename from include_bsd/x86/init.h
rename to include/freebsd/x86/init.h
diff --git a/include_bsd/x86/legacyvar.h b/include/freebsd/x86/legacyvar.h
similarity index 100%
rename from include_bsd/x86/legacyvar.h
rename to include/freebsd/x86/legacyvar.h
diff --git a/include_bsd/x86/mca.h b/include/freebsd/x86/mca.h
similarity index 100%
rename from include_bsd/x86/mca.h
rename to include/freebsd/x86/mca.h
diff --git a/include_bsd/x86/metadata.h b/include/freebsd/x86/metadata.h
similarity index 100%
rename from include_bsd/x86/metadata.h
rename to include/freebsd/x86/metadata.h
diff --git a/include_bsd/x86/mptable.h b/include/freebsd/x86/mptable.h
similarity index 100%
rename from include_bsd/x86/mptable.h
rename to include/freebsd/x86/mptable.h
diff --git a/include_bsd/x86/ofw_machdep.h b/include/freebsd/x86/ofw_machdep.h
similarity index 100%
rename from include_bsd/x86/ofw_machdep.h
rename to include/freebsd/x86/ofw_machdep.h
diff --git a/include_bsd/x86/pci_cfgreg.h b/include/freebsd/x86/pci_cfgreg.h
similarity index 100%
rename from include_bsd/x86/pci_cfgreg.h
rename to include/freebsd/x86/pci_cfgreg.h
diff --git a/include_bsd/x86/psl.h b/include/freebsd/x86/psl.h
similarity index 100%
rename from include_bsd/x86/psl.h
rename to include/freebsd/x86/psl.h
diff --git a/include_bsd/x86/ptrace.h b/include/freebsd/x86/ptrace.h
similarity index 100%
rename from include_bsd/x86/ptrace.h
rename to include/freebsd/x86/ptrace.h
diff --git a/include_bsd/x86/pvclock.h b/include/freebsd/x86/pvclock.h
similarity index 100%
rename from include_bsd/x86/pvclock.h
rename to include/freebsd/x86/pvclock.h
diff --git a/include_bsd/x86/reg.h b/include/freebsd/x86/reg.h
similarity index 100%
rename from include_bsd/x86/reg.h
rename to include/freebsd/x86/reg.h
diff --git a/include_bsd/x86/segments.h b/include/freebsd/x86/segments.h
similarity index 100%
rename from include_bsd/x86/segments.h
rename to include/freebsd/x86/segments.h
diff --git a/include_bsd/x86/setjmp.h b/include/freebsd/x86/setjmp.h
similarity index 100%
rename from include_bsd/x86/setjmp.h
rename to include/freebsd/x86/setjmp.h
diff --git a/include_bsd/x86/sigframe.h b/include/freebsd/x86/sigframe.h
similarity index 100%
rename from include_bsd/x86/sigframe.h
rename to include/freebsd/x86/sigframe.h
diff --git a/include_bsd/x86/signal.h b/include/freebsd/x86/signal.h
similarity index 100%
rename from include_bsd/x86/signal.h
rename to include/freebsd/x86/signal.h
diff --git a/include_bsd/x86/specialreg.h b/include/freebsd/x86/specialreg.h
similarity index 100%
rename from include_bsd/x86/specialreg.h
rename to include/freebsd/x86/specialreg.h
diff --git a/include_bsd/x86/stack.h b/include/freebsd/x86/stack.h
similarity index 100%
rename from include_bsd/x86/stack.h
rename to include/freebsd/x86/stack.h
diff --git a/include_bsd/x86/stdarg.h b/include/freebsd/x86/stdarg.h
similarity index 100%
rename from include_bsd/x86/stdarg.h
rename to include/freebsd/x86/stdarg.h
diff --git a/include_bsd/x86/sysarch.h b/include/freebsd/x86/sysarch.h
similarity index 100%
rename from include_bsd/x86/sysarch.h
rename to include/freebsd/x86/sysarch.h
diff --git a/include_bsd/x86/trap.h b/include/freebsd/x86/trap.h
similarity index 100%
rename from include_bsd/x86/trap.h
rename to include/freebsd/x86/trap.h
diff --git a/include_bsd/x86/ucontext.h b/include/freebsd/x86/ucontext.h
similarity index 100%
rename from include_bsd/x86/ucontext.h
rename to include/freebsd/x86/ucontext.h
diff --git a/include_bsd/x86/vdso.h b/include/freebsd/x86/vdso.h
similarity index 100%
rename from include_bsd/x86/vdso.h
rename to include/freebsd/x86/vdso.h
diff --git a/include_bsd/x86/vmware.h b/include/freebsd/x86/vmware.h
similarity index 100%
rename from include_bsd/x86/vmware.h
rename to include/freebsd/x86/vmware.h
diff --git a/include_bsd/x86/x86_smp.h b/include/freebsd/x86/x86_smp.h
similarity index 100%
rename from include_bsd/x86/x86_smp.h
rename to include/freebsd/x86/x86_smp.h
diff --git a/include_bsd/x86/x86_var.h b/include/freebsd/x86/x86_var.h
similarity index 100%
rename from include_bsd/x86/x86_var.h
rename to include/freebsd/x86/x86_var.h
diff --git a/include_bsd/xdbm.h b/include/freebsd/xdbm.h
similarity index 100%
rename from include_bsd/xdbm.h
rename to include/freebsd/xdbm.h
diff --git a/include_bsd/xlocale.h b/include/freebsd/xlocale.h
similarity index 100%
rename from include_bsd/xlocale.h
rename to include/freebsd/xlocale.h
diff --git a/include_bsd/xlocale/_ctype.h b/include/freebsd/xlocale/_ctype.h
similarity index 100%
rename from include_bsd/xlocale/_ctype.h
rename to include/freebsd/xlocale/_ctype.h
diff --git a/include_bsd/xlocale/_inttypes.h b/include/freebsd/xlocale/_inttypes.h
similarity index 100%
rename from include_bsd/xlocale/_inttypes.h
rename to include/freebsd/xlocale/_inttypes.h
diff --git a/include_bsd/xlocale/_langinfo.h b/include/freebsd/xlocale/_langinfo.h
similarity index 100%
rename from include_bsd/xlocale/_langinfo.h
rename to include/freebsd/xlocale/_langinfo.h
diff --git a/include_bsd/xlocale/_locale.h b/include/freebsd/xlocale/_locale.h
similarity index 100%
rename from include_bsd/xlocale/_locale.h
rename to include/freebsd/xlocale/_locale.h
diff --git a/include_bsd/xlocale/_monetary.h b/include/freebsd/xlocale/_monetary.h
similarity index 100%
rename from include_bsd/xlocale/_monetary.h
rename to include/freebsd/xlocale/_monetary.h
diff --git a/include_bsd/xlocale/_stdio.h b/include/freebsd/xlocale/_stdio.h
similarity index 100%
rename from include_bsd/xlocale/_stdio.h
rename to include/freebsd/xlocale/_stdio.h
diff --git a/include_bsd/xlocale/_stdlib.h b/include/freebsd/xlocale/_stdlib.h
similarity index 100%
rename from include_bsd/xlocale/_stdlib.h
rename to include/freebsd/xlocale/_stdlib.h
diff --git a/include_bsd/xlocale/_string.h b/include/freebsd/xlocale/_string.h
similarity index 100%
rename from include_bsd/xlocale/_string.h
rename to include/freebsd/xlocale/_string.h
diff --git a/include_bsd/xlocale/_strings.h b/include/freebsd/xlocale/_strings.h
similarity index 100%
rename from include_bsd/xlocale/_strings.h
rename to include/freebsd/xlocale/_strings.h
diff --git a/include_bsd/xlocale/_time.h b/include/freebsd/xlocale/_time.h
similarity index 100%
rename from include_bsd/xlocale/_time.h
rename to include/freebsd/xlocale/_time.h
diff --git a/include_bsd/xlocale/_uchar.h b/include/freebsd/xlocale/_uchar.h
similarity index 100%
rename from include_bsd/xlocale/_uchar.h
rename to include/freebsd/xlocale/_uchar.h
diff --git a/include_bsd/xlocale/_wchar.h b/include/freebsd/xlocale/_wchar.h
similarity index 100%
rename from include_bsd/xlocale/_wchar.h
rename to include/freebsd/xlocale/_wchar.h
diff --git a/include_bsd/ypclnt.h b/include/freebsd/ypclnt.h
similarity index 100%
rename from include_bsd/ypclnt.h
rename to include/freebsd/ypclnt.h
diff --git a/include_khronos/EGL/egl.h b/include/khronos/EGL/egl.h
similarity index 100%
rename from include_khronos/EGL/egl.h
rename to include/khronos/EGL/egl.h
diff --git a/include_khronos/EGL/eglext.h b/include/khronos/EGL/eglext.h
similarity index 100%
rename from include_khronos/EGL/eglext.h
rename to include/khronos/EGL/eglext.h
diff --git a/include_khronos/EGL/eglplatform.h b/include/khronos/EGL/eglplatform.h
similarity index 100%
rename from include_khronos/EGL/eglplatform.h
rename to include/khronos/EGL/eglplatform.h
diff --git a/include_khronos/GLES2/gl2.h b/include/khronos/GLES2/gl2.h
similarity index 100%
rename from include_khronos/GLES2/gl2.h
rename to include/khronos/GLES2/gl2.h
diff --git a/include_khronos/GLES2/gl2ext.h b/include/khronos/GLES2/gl2ext.h
similarity index 100%
rename from include_khronos/GLES2/gl2ext.h
rename to include/khronos/GLES2/gl2ext.h
diff --git a/include_khronos/GLES2/gl2platform.h b/include/khronos/GLES2/gl2platform.h
similarity index 100%
rename from include_khronos/GLES2/gl2platform.h
rename to include/khronos/GLES2/gl2platform.h
diff --git a/include_khronos/KHR/khrplatform.h b/include/khronos/KHR/khrplatform.h
similarity index 100%
rename from include_khronos/KHR/khrplatform.h
rename to include/khronos/KHR/khrplatform.h
diff --git a/include_ps5/kernel.h b/include/ps5/kernel.h
similarity index 100%
rename from include_ps5/kernel.h
rename to include/ps5/kernel.h
diff --git a/include_ps5/klog.h b/include/ps5/klog.h
similarity index 100%
rename from include_ps5/klog.h
rename to include/ps5/klog.h
diff --git a/include_ps5/mdbg.h b/include/ps5/mdbg.h
similarity index 100%
rename from include_ps5/mdbg.h
rename to include/ps5/mdbg.h
diff --git a/include_ps5/payload.h b/include/ps5/payload.h
similarity index 100%
rename from include_ps5/payload.h
rename to include/ps5/payload.h
diff --git a/samples/arbitrary_syscall/Makefile b/samples/arbitrary_syscall/Makefile
index a7fe875..0bed477 100644
--- a/samples/arbitrary_syscall/Makefile
+++ b/samples/arbitrary_syscall/Makefile
@@ -18,7 +18,7 @@ PS5_HOST ?= ps5
 PS5_PORT ?= 9021
 
 ifdef PS5_PAYLOAD_SDK
-    include $(PS5_PAYLOAD_SDK)/make/toolchain.mk
+    include $(PS5_PAYLOAD_SDK)/toolchain/prospero.mk
 else
     $(error PS5_PAYLOAD_SDK is undefined)
 endif
diff --git a/samples/browser/Makefile b/samples/browser/Makefile
index e2369fe..c1b445b 100644
--- a/samples/browser/Makefile
+++ b/samples/browser/Makefile
@@ -19,7 +19,7 @@ PS5_PORT ?= 9021
 PS5_URL  ?= http://192.168.1.1
 
 ifdef PS5_PAYLOAD_SDK
-    include $(PS5_PAYLOAD_SDK)/make/toolchain.mk
+    include $(PS5_PAYLOAD_SDK)/toolchain/prospero.mk
 else
     $(error PS5_PAYLOAD_SDK is undefined)
 endif
diff --git a/samples/hello_cmake/CMakeLists.txt b/samples/hello_cmake/CMakeLists.txt
index 5e65679..f8b6bdb 100644
--- a/samples/hello_cmake/CMakeLists.txt
+++ b/samples/hello_cmake/CMakeLists.txt
@@ -1,12 +1,5 @@
 cmake_minimum_required(VERSION 3.0)
 
-if(DEFINED ENV{PS5_PAYLOAD_SDK})
-  set(CMAKE_TOOLCHAIN_FILE $ENV{PS5_PAYLOAD_SDK}/cmake/toolchain.cmake)
-else()
-  message(FATAL_ERROR "PS5_PAYLOAD_SDK is undefined")
-endif()
-
 project(hello_cmake C)
 add_executable(${PROJECT_NAME} main.c)
-target_link_libraries(${PROJECT_NAME} kernel_web)
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "${PROJECT_NAME}.elf")
diff --git a/samples/hello_cmake/build.sh b/samples/hello_cmake/build.sh
deleted file mode 100755
index 570dd54..0000000
--- a/samples/hello_cmake/build.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-SCRIPTDIR="${BASH_SOURCE[0]}"
-SCRIPTDIR="$(dirname "${SCRIPTDIR}")"
-
-cd $SCRIPTDIR
-rm -rf build
-cmake -B build || exit 1
-make  -C build || exit 1
diff --git a/samples/hello_sprx/Makefile b/samples/hello_sprx/Makefile
index 94b7403..b64c3d0 100644
--- a/samples/hello_sprx/Makefile
+++ b/samples/hello_sprx/Makefile
@@ -18,7 +18,7 @@ PS5_HOST ?= ps5
 PS5_PORT ?= 9021
 
 ifdef PS5_PAYLOAD_SDK
-    include $(PS5_PAYLOAD_SDK)/make/toolchain.mk
+    include $(PS5_PAYLOAD_SDK)/toolchain/prospero.mk
 else
     $(error PS5_PAYLOAD_SDK is undefined)
 endif
diff --git a/samples/hello_stdio/Makefile b/samples/hello_stdio/Makefile
index 2f65bd6..e753064 100644
--- a/samples/hello_stdio/Makefile
+++ b/samples/hello_stdio/Makefile
@@ -18,7 +18,7 @@ PS5_HOST ?= ps5
 PS5_PORT ?= 9021
 
 ifdef PS5_PAYLOAD_SDK
-    include $(PS5_PAYLOAD_SDK)/make/toolchain.mk
+    include $(PS5_PAYLOAD_SDK)/toolchain/prospero.mk
 else
     $(error PS5_PAYLOAD_SDK is undefined)
 endif
diff --git a/samples/hello_world/Makefile b/samples/hello_world/Makefile
index ca10c22..5adf1de 100644
--- a/samples/hello_world/Makefile
+++ b/samples/hello_world/Makefile
@@ -18,7 +18,7 @@ PS5_HOST ?= ps5
 PS5_PORT ?= 9021
 
 ifdef PS5_PAYLOAD_SDK
-    include $(PS5_PAYLOAD_SDK)/make/toolchain.mk
+    include $(PS5_PAYLOAD_SDK)/toolchain/prospero.mk
 else
     $(error PS5_PAYLOAD_SDK is undefined)
 endif
diff --git a/samples/http2_get/Makefile b/samples/http2_get/Makefile
index 1d149f9..1c9a046 100644
--- a/samples/http2_get/Makefile
+++ b/samples/http2_get/Makefile
@@ -18,7 +18,7 @@ PS5_HOST ?= ps5
 PS5_PORT ?= 9021
 
 ifdef PS5_PAYLOAD_SDK
-    include $(PS5_PAYLOAD_SDK)/make/toolchain.mk
+    include $(PS5_PAYLOAD_SDK)/toolchain/prospero.mk
 else
     $(error PS5_PAYLOAD_SDK is undefined)
 endif
diff --git a/samples/hwinfo/Makefile b/samples/hwinfo/Makefile
index a596c42..cfbcfdf 100644
--- a/samples/hwinfo/Makefile
+++ b/samples/hwinfo/Makefile
@@ -18,7 +18,7 @@ PS5_HOST ?= ps5
 PS5_PORT ?= 9021
 
 ifdef PS5_PAYLOAD_SDK
-    include $(PS5_PAYLOAD_SDK)/make/toolchain.mk
+    include $(PS5_PAYLOAD_SDK)/toolchain/prospero.mk
 else
     $(error PS5_PAYLOAD_SDK is undefined)
 endif
diff --git a/samples/list_files/Makefile b/samples/list_files/Makefile
index cdde2c3..b91656c 100644
--- a/samples/list_files/Makefile
+++ b/samples/list_files/Makefile
@@ -18,7 +18,7 @@ PS5_HOST ?= ps5
 PS5_PORT ?= 9021
 
 ifdef PS5_PAYLOAD_SDK
-    include $(PS5_PAYLOAD_SDK)/make/toolchain.mk
+    include $(PS5_PAYLOAD_SDK)/toolchain/prospero.mk
 else
     $(error PS5_PAYLOAD_SDK is undefined)
 endif
diff --git a/samples/mntinfo/Makefile b/samples/mntinfo/Makefile
index 55d149e..7e5e9a4 100644
--- a/samples/mntinfo/Makefile
+++ b/samples/mntinfo/Makefile
@@ -18,7 +18,7 @@ PS5_HOST ?= ps5
 PS5_PORT ?= 9021
 
 ifdef PS5_PAYLOAD_SDK
-    include $(PS5_PAYLOAD_SDK)/make/toolchain.mk
+    include $(PS5_PAYLOAD_SDK)/toolchain/prospero.mk
 else
     $(error PS5_PAYLOAD_SDK is undefined)
 endif
diff --git a/samples/ps/Makefile b/samples/ps/Makefile
index 72f3755..8522a1f 100644
--- a/samples/ps/Makefile
+++ b/samples/ps/Makefile
@@ -18,7 +18,7 @@ PS5_HOST ?= ps5
 PS5_PORT ?= 9021
 
 ifdef PS5_PAYLOAD_SDK
-    include $(PS5_PAYLOAD_SDK)/make/toolchain.mk
+    include $(PS5_PAYLOAD_SDK)/toolchain/prospero.mk
 else
     $(error PS5_PAYLOAD_SDK is undefined)
 endif
diff --git a/sce_stubs/Makefile b/sce_stubs/Makefile
index 0087fa3..aee5d93 100644
--- a/sce_stubs/Makefile
+++ b/sce_stubs/Makefile
@@ -17,14 +17,14 @@
 PYTHON  ?= python3
 DESTDIR ?= /opt/ps5-payload-sdk
 
-CCS := clang-18 clang-17 clang-16 clang-15
+CCS := clang-18 clang-17 clang-16 clang-15 clang
 CCS := $(foreach CC,$(CCS),$(if $(shell command -v $(CC) 2> /dev/null),$(CC)))
 CC  := $(firstword $(CCS))
 ifndef CC
     $(error No suitable compiler found)
 endif
 
-LDS := ld.lld-18 ld.lld-17 ld.lld-16 ld.lld-15
+LDS := ld.lld-18 ld.lld-17 ld.lld-16 ld.lld-15 ld.lld
 LDS := $(foreach LD,$(LDS),$(if $(shell command -v $(LD) 2> /dev/null),$(LD)))
 LD  := $(firstword $(LDS))
 ifndef CC
@@ -64,5 +64,5 @@ clean:
 	rm -f *.o *.so $(NID_DB)
 
 install: $(SHARED)
-	install -d $(DESTDIR)/sysroot/usr/lib
-	install $(SHARED) $(DESTDIR)/sysroot/usr/lib
+	install -d $(DESTDIR)/target/lib
+	install $(SHARED) $(DESTDIR)/target/lib