Index: ObsoleteFiles.inc
===================================================================
--- ObsoleteFiles.inc
+++ ObsoleteFiles.inc
@@ -52,6 +52,12 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 2022mmdd: unwind headers moved to /usr/include
+OLD_FILES+=usr/include/c++/v1/cxxabi.h
+OLD_FILES+=usr/include/c++/v1/unwind-arm.h
+OLD_FILES+=usr/include/c++/v1/unwind-itanium.h
+OLD_FILES+=usr/include/c++/v1/unwind.h
+
 # 20211229: libc++ moved to /lib
 MOVED_LIBS+=usr/lib/libc++.so.1
 
Index: lib/libc++/Makefile
===================================================================
--- lib/libc++/Makefile
+++ lib/libc++/Makefile
@@ -238,14 +238,6 @@
 # CMake, and as of 13.0.0 installed side-by-side with__config.
 STD+=		${.CURDIR}/__config_site
 
-RT_HEADERS+=	cxxabi.h
-RT_HEADERS+=	unwind-arm.h
-RT_HEADERS+=	unwind-itanium.h
-RT_HEADERS+=	unwind.h
-.for hdr in ${RT_HEADERS}
-STD+=		${_LIBCXXRTDIR}/${hdr}
-.endfor
-
 INCSGROUPS+=	ALG
 ALGDIR=		${CXXINCLUDEDIR}/__algorithm
 ALG_HEADERS+=	adjacent_find.h
Index: lib/libgcc_eh/Makefile
===================================================================
--- lib/libgcc_eh/Makefile
+++ lib/libgcc_eh/Makefile
@@ -11,6 +11,12 @@
 SRCS_EXC+=	int_util.c
 .include "Makefile.inc"
 
+INCS+=		${UNWINDINCDIR}/__libunwind_config.h
+INCS+=		${UNWINDINCDIR}/libunwind.h
+INCS+=		${UNWINDINCDIR}/unwind.h
+INCS+=		${UNWINDINCDIR}/unwind_arm_ehabi.h
+INCS+=		${UNWINDINCDIR}/unwind_itanium.h
+
 .if ${.MAKE.LEVEL} > 0
 # avoid circular dependencies
 GENDIRDEPS_FILTER+= Nlib/msun