diff --git a/src/include/Makefile b/src/include/Makefile
index 23c457d0..a9dcb9ea 100644
--- a/src/include/Makefile
+++ b/src/include/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.46 1997/08/18 05:29:41 millert Exp $
+#	$OpenBSD: Makefile,v 1.47 1998/03/03 21:15:22 niklas Exp $
 #	$NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $
 
 #	@(#)Makefile	5.45.1.1 (Berkeley) 5/6/91
@@ -13,8 +13,8 @@ FILES=	a.out.h ar.h assert.h bitstring.h blf.h bm.h cpio.h ctype.h db.h \
 	glob.h grp.h ieeefp.h inttypes.h iso646.h kvm.h langinfo.h libgen.h \
 	limits.h locale.h malloc.h math.h md4.h md5.h memory.h mpool.h ndbm.h \
 	netdb.h netgroup.h nlist.h nl_types.h olf_abi.h paths.h poll.h pwd.h \
-	ranlib.h re_comp.h regex.h resolv.h rmd160.h search.h setjmp.h sgtty.h \
-	sha1.h signal.h stab.h stddef.h stdio.h stdlib.h string.h \
+	ranlib.h re_comp.h regex.h resolv.h rmd160.h search.h setjmp.h \
+	sgtty.h sha1.h signal.h stab.h stddef.h stdio.h stdlib.h string.h \
 	strings.h struct.h sysexits.h tar.h time.h ttyent.h tzfile.h \
 	unistd.h utime.h utmp.h vis.h
 
@@ -39,6 +39,10 @@ RDIRS=	../lib/libcom_err ../lib/libcompat ../lib/libcurses ../lib/libform \
 	../lib/libpcap ../lib/libutil ../lib/libwrap ../lib/libz \
 	../sys/arch/${MACHINE}
 
+WDIRS=	../gnu/lib/libg++/libg++ ../gnu/lib/libg++/libio \
+	../gnu/lib/libg++/librx ../gnu/lib/libg++/libstdc++ \
+	../gnu/usr.bin/gcc
+
 NOOBJ=	noobj
 
 # Change SYS_INCLUDE in bsd.own.mk to "symlinks" if you don't want copies
@@ -82,6 +86,10 @@ includes:
 		echo installing in ${.CURDIR}/$$i; \
 		(cd ${.CURDIR}/$$i; ${MAKE} includes) \
 	done
+	@-for i in ${WDIRS}; do \
+		echo installing in ${.CURDIR}/$$i; \
+		(cd ${.CURDIR}/$$i; ${MAKE} -f Makefile.bsd-wrapper includes) \
+	done
 
 copies:
 	@echo copies: ${LDIRS}