14 files changed, 5 insertions, 28 deletions
diff --git a/lib/libopenbsd/Makefile b/lib/libopenbsd/Makefile
index 267d9ceca279..80ae0f90621a 100644
--- a/lib/libopenbsd/Makefile
+++ b/lib/libopenbsd/Makefile
@@ -1,10 +1,12 @@
-# $FreeBSD$
-
-PACKAGE=lib${LIB}
 LIB=	openbsd
 SRCS=	imsg-buffer.c \
 	imsg.c \
 	ohash.c
+.if defined(BOOTSTRAPPING)
+.PATH:	${SRCTOP}/lib/libc/stdlib
+SRCS+=	recallocarray.c
+.endif
+
 .if !defined(BOOTSTRAPPING)
 # Skip getdtablecount.c when bootstrapping since it doesn't compile for Linux
 # and is not used by any of the bootstrap tools
diff --git a/lib/libopenbsd/Makefile.depend b/lib/libopenbsd/Makefile.depend
index 18be76b0cb6f..15a1f9c07f7c 100644
--- a/lib/libopenbsd/Makefile.depend
+++ b/lib/libopenbsd/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
diff --git a/lib/libopenbsd/README b/lib/libopenbsd/README
index e9f6d70b5fc5..f3ffe54a5797 100644
--- a/lib/libopenbsd/README
+++ b/lib/libopenbsd/README
@@ -1,4 +1,3 @@
-$FreeBSD$
 
 libopenbsd is a thin compatibility layer intended to allow a limited
 set of OpenBSD software to compile as part of the FreeBSD build with
diff --git a/lib/libopenbsd/getdtablecount.c b/lib/libopenbsd/getdtablecount.c
index 9d2ba2575074..96dc58274c05 100644
--- a/lib/libopenbsd/getdtablecount.c
+++ b/lib/libopenbsd/getdtablecount.c
@@ -24,9 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #include <stddef.h>
diff --git a/lib/libopenbsd/imsg-buffer.c b/lib/libopenbsd/imsg-buffer.c
index 2ea4d20b9fcd..bac62f1e38ed 100644
--- a/lib/libopenbsd/imsg-buffer.c
+++ b/lib/libopenbsd/imsg-buffer.c
@@ -14,8 +14,6 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/lib/libopenbsd/imsg.c b/lib/libopenbsd/imsg.c
index 279ab63e5245..9047997c1569 100644
--- a/lib/libopenbsd/imsg.c
+++ b/lib/libopenbsd/imsg.c
@@ -14,8 +14,6 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/lib/libopenbsd/imsg.h b/lib/libopenbsd/imsg.h
index 10d684736ed2..89946578b903 100644
--- a/lib/libopenbsd/imsg.h
+++ b/lib/libopenbsd/imsg.h
@@ -16,8 +16,6 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $FreeBSD$
  */
 
 #ifndef _IMSG_H_
diff --git a/lib/libopenbsd/imsg_init.3 b/lib/libopenbsd/imsg_init.3
index 22b20af3bd64..551a494bf00b 100644
--- a/lib/libopenbsd/imsg_init.3
+++ b/lib/libopenbsd/imsg_init.3
@@ -14,8 +14,6 @@
 .\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD$
-.\"
 .Dd $Mdocdate: July 11 2015 $
 .Dt IMSG_INIT 3
 .Os
diff --git a/lib/libopenbsd/ohash.c b/lib/libopenbsd/ohash.c
index 3a0f5dde449c..de5d47563c5b 100644
--- a/lib/libopenbsd/ohash.c
+++ b/lib/libopenbsd/ohash.c
@@ -16,8 +16,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/lib/libopenbsd/ohash.h b/lib/libopenbsd/ohash.h
index ff21c8599ead..617434497c74 100644
--- a/lib/libopenbsd/ohash.h
+++ b/lib/libopenbsd/ohash.h
@@ -13,8 +13,6 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $FreeBSD$
  */
 
 #ifndef OHASH_H
diff --git a/lib/libopenbsd/ohash_init.3 b/lib/libopenbsd/ohash_init.3
index 184c4e389b24..b1fccacc7597 100644
--- a/lib/libopenbsd/ohash_init.3
+++ b/lib/libopenbsd/ohash_init.3
@@ -13,8 +13,6 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD$
-.\"
 .Dd May 12, 2014
 .Dt OHASH_INIT 3
 .Os
diff --git a/lib/libopenbsd/ohash_interval.3 b/lib/libopenbsd/ohash_interval.3
index 3809c34e3c0f..4b05dc65e88c 100644
--- a/lib/libopenbsd/ohash_interval.3
+++ b/lib/libopenbsd/ohash_interval.3
@@ -13,8 +13,6 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD$
-.\"
 .Dd June 5, 2013
 .Dt OHASH_INTERVAL 3
 .Os
diff --git a/lib/libopenbsd/sys/sysctl.h b/lib/libopenbsd/sys/sysctl.h
index 7fba07feb216..a4eb1fbb488b 100644
--- a/lib/libopenbsd/sys/sysctl.h
+++ b/lib/libopenbsd/sys/sysctl.h
@@ -22,8 +22,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef _LIBOPENBSD_SYS_SYSCTL_H_
diff --git a/lib/libopenbsd/unistd.h b/lib/libopenbsd/unistd.h
index 4615e6d0812d..15189bcfabca 100644
--- a/lib/libopenbsd/unistd.h
+++ b/lib/libopenbsd/unistd.h
@@ -22,8 +22,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef _LIBOPENBSD_UNISTD_H_