diff --git a/lang/gcc/16/pkg/PFRAG.128BIT-ada b/lang/gcc/16/pkg/PFRAG.128BIT-ada
index 63438a5a6d6..6039e14a989 100644
--- a/lang/gcc/16/pkg/PFRAG.128BIT-ada
+++ b/lang/gcc/16/pkg/PFRAG.128BIT-ada
@@ -15,8 +15,6 @@ lib/gcc/${CONFIG}/${V}/adainclude/s-imglllb.ads
 lib/gcc/${CONFIG}/${V}/adainclude/s-imgllli.ads
 lib/gcc/${CONFIG}/${V}/adainclude/s-imglllu.ads
 lib/gcc/${CONFIG}/${V}/adainclude/s-imglllw.ads
-lib/gcc/${CONFIG}/${V}/adainclude/s-vade128.ads
-lib/gcc/${CONFIG}/${V}/adainclude/s-vafi128.ads
 lib/gcc/${CONFIG}/${V}/adainclude/s-pack100.adb
 lib/gcc/${CONFIG}/${V}/adainclude/s-pack100.ads
 lib/gcc/${CONFIG}/${V}/adainclude/s-pack101.adb
@@ -143,6 +141,8 @@ lib/gcc/${CONFIG}/${V}/adainclude/s-pack98.adb
 lib/gcc/${CONFIG}/${V}/adainclude/s-pack98.ads
 lib/gcc/${CONFIG}/${V}/adainclude/s-pack99.adb
 lib/gcc/${CONFIG}/${V}/adainclude/s-pack99.ads
+lib/gcc/${CONFIG}/${V}/adainclude/s-vade128.ads
+lib/gcc/${CONFIG}/${V}/adainclude/s-vafi128.ads
 lib/gcc/${CONFIG}/${V}/adainclude/s-valllli.ads
 lib/gcc/${CONFIG}/${V}/adainclude/s-vallllu.ads
 lib/gcc/${CONFIG}/${V}/adainclude/s-widllli.ads
diff --git a/lang/gcc/16/pkg/PFRAG.X86-main b/lang/gcc/16/pkg/PFRAG.X86-main
index f42114641af..028985f7e50 100644
--- a/lang/gcc/16/pkg/PFRAG.X86-main
+++ b/lang/gcc/16/pkg/PFRAG.X86-main
@@ -101,11 +101,9 @@ lib/gcc/${CONFIG}/${V}/include/sm3intrin.h
 lib/gcc/${CONFIG}/${V}/include/sm4intrin.h
 lib/gcc/${CONFIG}/${V}/include/smmintrin.h
 lib/gcc/${CONFIG}/${V}/include/tbmintrin.h
-lib/gcc/${CONFIG}/${V}/include/tgmath.h
 lib/gcc/${CONFIG}/${V}/include/tmmintrin.h
 lib/gcc/${CONFIG}/${V}/include/tsxldtrkintrin.h
 lib/gcc/${CONFIG}/${V}/include/uintrintrin.h
-lib/gcc/${CONFIG}/${V}/include/unwind.h
 lib/gcc/${CONFIG}/${V}/include/usermsrintrin.h
 lib/gcc/${CONFIG}/${V}/include/vaesintrin.h
 lib/gcc/${CONFIG}/${V}/include/vpclmulqdqintrin.h
@@ -121,4 +119,18 @@ lib/gcc/${CONFIG}/${V}/include/xsaveintrin.h
 lib/gcc/${CONFIG}/${V}/include/xsaveoptintrin.h
 lib/gcc/${CONFIG}/${V}/include/xsavesintrin.h
 lib/gcc/${CONFIG}/${V}/include/xtestintrin.h
+lib/gcc/${CONFIG}/${V}/plugin/include/common/
+lib/gcc/${CONFIG}/${V}/plugin/include/common/config/
+lib/gcc/${CONFIG}/${V}/plugin/include/common/config/i386/
+lib/gcc/${CONFIG}/${V}/plugin/include/common/config/i386/i386-cpuinfo.h
+lib/gcc/${CONFIG}/${V}/plugin/include/config/i386/
+lib/gcc/${CONFIG}/${V}/plugin/include/config/i386/att.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/i386/i386-isa.def
+lib/gcc/${CONFIG}/${V}/plugin/include/config/i386/i386-opts.h
+lib/gcc/${CONFIG}/${V}/plugin/include/config/i386/i386-protos.h
+lib/gcc/${CONFIG}/${V}/plugin/include/config/i386/i386.h
+lib/gcc/${CONFIG}/${V}/plugin/include/config/i386/openbsdelf.h
+lib/gcc/${CONFIG}/${V}/plugin/include/config/i386/stringop.def
+lib/gcc/${CONFIG}/${V}/plugin/include/config/i386/unix.h
+lib/gcc/${CONFIG}/${V}/plugin/include/config/i386/x86-tune.def
+lib/gcc/${CONFIG}/${V}/plugin/include/config/vxworks-dummy.h
diff --git a/lang/gcc/16/pkg/PFRAG.aarch64-main b/lang/gcc/16/pkg/PFRAG.aarch64-main
index 9d41e04c53c..e7eb25cc2f8 100644
--- a/lang/gcc/16/pkg/PFRAG.aarch64-main
+++ b/lang/gcc/16/pkg/PFRAG.aarch64-main
@@ -8,8 +8,6 @@ lib/gcc/${CONFIG}/${V}/include/arm_private_fp8.h
 lib/gcc/${CONFIG}/${V}/include/arm_private_neon_types.h
 lib/gcc/${CONFIG}/${V}/include/arm_sme.h
 lib/gcc/${CONFIG}/${V}/include/arm_sve.h
-lib/gcc/${CONFIG}/${V}/include/tgmath.h
-lib/gcc/${CONFIG}/${V}/include/unwind.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/aarch64/
 lib/gcc/${CONFIG}/${V}/plugin/include/config/aarch64/aarch64-arches.def
 lib/gcc/${CONFIG}/${V}/plugin/include/config/aarch64/aarch64-cores.def
@@ -27,9 +25,4 @@ lib/gcc/${CONFIG}/${V}/plugin/include/config/aarch64/openbsd.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/arm/
 lib/gcc/${CONFIG}/${V}/plugin/include/config/arm/aarch-common-protos.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/arm/aarch-common.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/elfos.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/initfini-array.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd-libpthread.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd-stdint.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/vxworks-dummy.h
diff --git a/lang/gcc/16/pkg/PFRAG.alpha-main b/lang/gcc/16/pkg/PFRAG.alpha-main
index c50c5297deb..86313fe11b9 100644
--- a/lang/gcc/16/pkg/PFRAG.alpha-main
+++ b/lang/gcc/16/pkg/PFRAG.alpha-main
@@ -1,12 +1,5 @@
-lib/gcc/${CONFIG}/${V}/include/tgmath.h
-lib/gcc/${CONFIG}/${V}/include/unwind.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/alpha/
 lib/gcc/${CONFIG}/${V}/plugin/include/config/alpha/alpha-protos.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/alpha/alpha.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/alpha/elf.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/alpha/openbsd.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/elfos.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/initfini-array.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd-libpthread.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd-stdint.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd.h
diff --git a/lang/gcc/16/pkg/PFRAG.amd64-main b/lang/gcc/16/pkg/PFRAG.amd64-main
index 891e4b89c45..b76f4b51aae 100644
--- a/lang/gcc/16/pkg/PFRAG.amd64-main
+++ b/lang/gcc/16/pkg/PFRAG.amd64-main
@@ -1,46 +1,2 @@
-lib/gcc/${CONFIG}/${V}/include/amxavx512intrin.h
-lib/gcc/${CONFIG}/${V}/include/amxcomplexintrin.h
-lib/gcc/${CONFIG}/${V}/include/amxfp16intrin.h
-lib/gcc/${CONFIG}/${V}/include/amxfp8intrin.h
-lib/gcc/${CONFIG}/${V}/include/amxmovrsintrin.h
-lib/gcc/${CONFIG}/${V}/include/amxtf32intrin.h
-lib/gcc/${CONFIG}/${V}/include/avx10_2bf16intrin.h
-lib/gcc/${CONFIG}/${V}/include/avx10_2convertintrin.h
-lib/gcc/${CONFIG}/${V}/include/avx10_2copyintrin.h
-lib/gcc/${CONFIG}/${V}/include/avx10_2mediaintrin.h
-lib/gcc/${CONFIG}/${V}/include/avx10_2minmaxintrin.h
-lib/gcc/${CONFIG}/${V}/include/avx10_2satcvtintrin.h
-lib/gcc/${CONFIG}/${V}/include/avxifmaintrin.h
-lib/gcc/${CONFIG}/${V}/include/avxneconvertintrin.h
-lib/gcc/${CONFIG}/${V}/include/avxvnniint16intrin.h
-lib/gcc/${CONFIG}/${V}/include/avxvnniint8intrin.h
-lib/gcc/${CONFIG}/${V}/include/cmpccxaddintrin.h
-lib/gcc/${CONFIG}/${V}/include/movrsintrin.h
-lib/gcc/${CONFIG}/${V}/include/prfchiintrin.h
-lib/gcc/${CONFIG}/${V}/include/raointintrin.h
-lib/gcc/${CONFIG}/${V}/include/sha512intrin.h
-lib/gcc/${CONFIG}/${V}/include/sm3intrin.h
-lib/gcc/${CONFIG}/${V}/include/sm4intrin.h
-lib/gcc/${CONFIG}/${V}/include/usermsrintrin.h
-lib/gcc/${CONFIG}/${V}/plugin/include/common/
-lib/gcc/${CONFIG}/${V}/plugin/include/common/config/
-lib/gcc/${CONFIG}/${V}/plugin/include/common/config/i386/
-lib/gcc/${CONFIG}/${V}/plugin/include/common/config/i386/i386-cpuinfo.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/elfos.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/i386/
-lib/gcc/${CONFIG}/${V}/plugin/include/config/i386/att.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/i386/biarch64.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/i386/i386-isa.def
-lib/gcc/${CONFIG}/${V}/plugin/include/config/i386/i386-opts.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/i386/i386-protos.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/i386/i386.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/i386/openbsdelf.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/i386/stringop.def
-lib/gcc/${CONFIG}/${V}/plugin/include/config/i386/unix.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/i386/x86-64.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/i386/x86-tune.def
-lib/gcc/${CONFIG}/${V}/plugin/include/config/initfini-array.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd-libpthread.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd-stdint.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/vxworks-dummy.h
diff --git a/lang/gcc/16/pkg/PFRAG.arm-main b/lang/gcc/16/pkg/PFRAG.arm-main
index e442b5d5a5d..04e510b2a44 100644
--- a/lang/gcc/16/pkg/PFRAG.arm-main
+++ b/lang/gcc/16/pkg/PFRAG.arm-main
@@ -7,9 +7,7 @@ lib/gcc/${CONFIG}/${V}/include/arm_mve.h
 lib/gcc/${CONFIG}/${V}/include/arm_mve_types.h
 lib/gcc/${CONFIG}/${V}/include/arm_neon.h
 lib/gcc/${CONFIG}/${V}/include/mmintrin.h
-lib/gcc/${CONFIG}/${V}/include/tgmath.h
 lib/gcc/${CONFIG}/${V}/include/unwind-arm-common.h
-lib/gcc/${CONFIG}/${V}/include/unwind.h
 lib/gcc/${CONFIG}/${V}/plugin/include/arm-cpu.h
 lib/gcc/${CONFIG}/${V}/plugin/include/arm-isa.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/arm/
@@ -22,9 +20,4 @@ lib/gcc/${CONFIG}/${V}/plugin/include/config/arm/arm.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/arm/elf.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/arm/openbsd.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/arm/openbsd1.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/elfos.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/initfini-array.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd-libpthread.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd-stdint.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/vxworks-dummy.h
diff --git a/lang/gcc/16/pkg/PFRAG.hppa-main b/lang/gcc/16/pkg/PFRAG.hppa-main
index c714392cb42..64130e16bfa 100644
--- a/lang/gcc/16/pkg/PFRAG.hppa-main
+++ b/lang/gcc/16/pkg/PFRAG.hppa-main
@@ -1,10 +1,3 @@
-lib/gcc/${CONFIG}/${V}/include/tgmath.h
-lib/gcc/${CONFIG}/${V}/include/unwind.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/elfos.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/initfini-array.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd-libpthread.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd-stdint.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/pa/
 lib/gcc/${CONFIG}/${V}/plugin/include/config/pa/pa-openbsd.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/pa/pa-opts.h
diff --git a/lang/gcc/16/pkg/PFRAG.i386-main b/lang/gcc/16/pkg/PFRAG.i386-main
deleted file mode 100644
index f861ac36054..00000000000
--- a/lang/gcc/16/pkg/PFRAG.i386-main
+++ /dev/null
@@ -1,19 +0,0 @@
-lib/gcc/${CONFIG}/${V}/plugin/include/common/
-lib/gcc/${CONFIG}/${V}/plugin/include/common/config/
-lib/gcc/${CONFIG}/${V}/plugin/include/common/config/i386/
-lib/gcc/${CONFIG}/${V}/plugin/include/common/config/i386/i386-cpuinfo.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/elfos.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/i386/
-lib/gcc/${CONFIG}/${V}/plugin/include/config/i386/att.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/i386/i386-opts.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/i386/i386-protos.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/i386/i386.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/i386/openbsdelf.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/i386/stringop.def
-lib/gcc/${CONFIG}/${V}/plugin/include/config/i386/unix.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/i386/x86-tune.def
-lib/gcc/${CONFIG}/${V}/plugin/include/config/initfini-array.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd-libpthread.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd-stdint.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/vxworks-dummy.h
diff --git a/lang/gcc/16/pkg/PFRAG.mips64-main b/lang/gcc/16/pkg/PFRAG.mips64-main
index 3b37eccd1ed..ce8f0f970d5 100644
--- a/lang/gcc/16/pkg/PFRAG.mips64-main
+++ b/lang/gcc/16/pkg/PFRAG.mips64-main
@@ -1,14 +1,7 @@
 lib/gcc/${CONFIG}/${V}/include/loongson.h
 lib/gcc/${CONFIG}/${V}/include/msa.h
-lib/gcc/${CONFIG}/${V}/include/tgmath.h
-lib/gcc/${CONFIG}/${V}/include/unwind.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/elfos.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/initfini-array.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/mips/
 lib/gcc/${CONFIG}/${V}/plugin/include/config/mips/mips.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/mips/mips-opts.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/mips/mips-protos.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/mips/openbsd.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd-libpthread.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd-stdint.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd.h
diff --git a/lang/gcc/16/pkg/PFRAG.mips64el-main b/lang/gcc/16/pkg/PFRAG.mips64el-main
index 3b37eccd1ed..ce8f0f970d5 100644
--- a/lang/gcc/16/pkg/PFRAG.mips64el-main
+++ b/lang/gcc/16/pkg/PFRAG.mips64el-main
@@ -1,14 +1,7 @@
 lib/gcc/${CONFIG}/${V}/include/loongson.h
 lib/gcc/${CONFIG}/${V}/include/msa.h
-lib/gcc/${CONFIG}/${V}/include/tgmath.h
-lib/gcc/${CONFIG}/${V}/include/unwind.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/elfos.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/initfini-array.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/mips/
 lib/gcc/${CONFIG}/${V}/plugin/include/config/mips/mips.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/mips/mips-opts.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/mips/mips-protos.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/mips/openbsd.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd-libpthread.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd-stdint.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd.h
diff --git a/lang/gcc/16/pkg/PFRAG.powerpc-main b/lang/gcc/16/pkg/PFRAG.powerpc-main
index ad17f1360a8..f83f4f2a1ea 100644
--- a/lang/gcc/16/pkg/PFRAG.powerpc-main
+++ b/lang/gcc/16/pkg/PFRAG.powerpc-main
@@ -16,19 +16,12 @@ lib/gcc/${CONFIG}/${V}/include/rs6000-vecdefines.h
 lib/gcc/${CONFIG}/${V}/include/si2vmx.h
 lib/gcc/${CONFIG}/${V}/include/smmintrin.h
 lib/gcc/${CONFIG}/${V}/include/spu2vmx.h
-lib/gcc/${CONFIG}/${V}/include/tgmath.h
 lib/gcc/${CONFIG}/${V}/include/tmmintrin.h
-lib/gcc/${CONFIG}/${V}/include/unwind.h
 lib/gcc/${CONFIG}/${V}/include/vec_types.h
 lib/gcc/${CONFIG}/${V}/include/x86intrin.h
 lib/gcc/${CONFIG}/${V}/include/xmmintrin.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/elfos.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/freebsd-spec.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/gnu-user.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/initfini-array.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd-libpthread.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd-stdint.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/rs6000/
 lib/gcc/${CONFIG}/${V}/plugin/include/config/rs6000/openbsd.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/rs6000/option-defaults.h
diff --git a/lang/gcc/16/pkg/PFRAG.powerpc64-main b/lang/gcc/16/pkg/PFRAG.powerpc64-main
index f724423e982..82f7e576f58 100644
--- a/lang/gcc/16/pkg/PFRAG.powerpc64-main
+++ b/lang/gcc/16/pkg/PFRAG.powerpc64-main
@@ -16,20 +16,13 @@ lib/gcc/${CONFIG}/${V}/include/rs6000-vecdefines.h
 lib/gcc/${CONFIG}/${V}/include/si2vmx.h
 lib/gcc/${CONFIG}/${V}/include/smmintrin.h
 lib/gcc/${CONFIG}/${V}/include/spu2vmx.h
-lib/gcc/${CONFIG}/${V}/include/tgmath.h
 lib/gcc/${CONFIG}/${V}/include/tmmintrin.h
-lib/gcc/${CONFIG}/${V}/include/unwind.h
 lib/gcc/${CONFIG}/${V}/include/vec_types.h
 lib/gcc/${CONFIG}/${V}/include/x86gprintrin.h
 lib/gcc/${CONFIG}/${V}/include/x86intrin.h
 lib/gcc/${CONFIG}/${V}/include/xmmintrin.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/elfos.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/freebsd-spec.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/gnu-user.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/initfini-array.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd-libpthread.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd-stdint.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/rs6000/
 lib/gcc/${CONFIG}/${V}/plugin/include/config/rs6000/default64.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/rs6000/openbsd64.h
diff --git a/lang/gcc/16/pkg/PFRAG.riscv64-main b/lang/gcc/16/pkg/PFRAG.riscv64-main
index 0e108d2fd22..7840f81e90c 100644
--- a/lang/gcc/16/pkg/PFRAG.riscv64-main
+++ b/lang/gcc/16/pkg/PFRAG.riscv64-main
@@ -4,14 +4,6 @@ lib/gcc/${CONFIG}/${V}/include/riscv_crypto.h
 lib/gcc/${CONFIG}/${V}/include/riscv_th_vector.h
 lib/gcc/${CONFIG}/${V}/include/riscv_vector.h
 lib/gcc/${CONFIG}/${V}/include/sifive_vector.h
-lib/gcc/${CONFIG}/${V}/include/tgmath.h
-lib/gcc/${CONFIG}/${V}/include/unwind.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/elfos.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/initfini-array.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd-libpthread.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd-stdint.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/riscv/
 lib/gcc/${CONFIG}/${V}/plugin/include/config/riscv/
 lib/gcc/${CONFIG}/${V}/plugin/include/config/riscv/openbsd.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/riscv/riscv-opts.h
diff --git a/lang/gcc/16/pkg/PFRAG.sparc64-main b/lang/gcc/16/pkg/PFRAG.sparc64-main
index 6e2ba3df0fe..860a487869a 100644
--- a/lang/gcc/16/pkg/PFRAG.sparc64-main
+++ b/lang/gcc/16/pkg/PFRAG.sparc64-main
@@ -1,11 +1,4 @@
-lib/gcc/${CONFIG}/${V}/include/tgmath.h
-lib/gcc/${CONFIG}/${V}/include/unwind.h
 lib/gcc/${CONFIG}/${V}/include/visintrin.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/elfos.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/initfini-array.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd-libpthread.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd-stdint.h
-lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/sparc/
 lib/gcc/${CONFIG}/${V}/plugin/include/config/sparc/openbsd1-64.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/sparc/openbsd64.h
diff --git a/lang/gcc/16/pkg/PLIST-c++ b/lang/gcc/16/pkg/PLIST-c++
index 853147922b5..e30a2b3e89a 100644
--- a/lang/gcc/16/pkg/PLIST-c++
+++ b/lang/gcc/16/pkg/PLIST-c++
@@ -786,32 +786,6 @@ include/c++/${V}/simd
 include/c++/${V}/source_location
 include/c++/${V}/span
 include/c++/${V}/spanstream
-include/c++/${V}/${CONFIG}/
-include/c++/${V}/${CONFIG}/bits/
-include/c++/${V}/${CONFIG}/bits/atomic_word.h
-include/c++/${V}/${CONFIG}/bits/basic_file.h
-include/c++/${V}/${CONFIG}/bits/c++allocator.h
-include/c++/${V}/${CONFIG}/bits/c++config.h
-include/c++/${V}/${CONFIG}/bits/c++io.h
-include/c++/${V}/${CONFIG}/bits/c++locale.h
-include/c++/${V}/${CONFIG}/bits/cpu_defines.h
-include/c++/${V}/${CONFIG}/bits/ctype_base.h
-include/c++/${V}/${CONFIG}/bits/ctype_inline.h
-include/c++/${V}/${CONFIG}/bits/cxxabi_tweaks.h
-include/c++/${V}/${CONFIG}/bits/error_constants.h
-include/c++/${V}/${CONFIG}/bits/extc++.h
-include/c++/${V}/${CONFIG}/bits/gthr-default.h
-include/c++/${V}/${CONFIG}/bits/gthr-posix.h
-include/c++/${V}/${CONFIG}/bits/gthr-single.h
-include/c++/${V}/${CONFIG}/bits/gthr.h
-include/c++/${V}/${CONFIG}/bits/messages_members.h
-include/c++/${V}/${CONFIG}/bits/opt_random.h
-include/c++/${V}/${CONFIG}/bits/os_defines.h
-include/c++/${V}/${CONFIG}/bits/stdc++.h
-include/c++/${V}/${CONFIG}/bits/stdtr1c++.h
-include/c++/${V}/${CONFIG}/bits/time_members.h
-include/c++/${V}/${CONFIG}/ext/
-include/c++/${V}/${CONFIG}/ext/opt_random.h
 include/c++/${V}/sstream
 include/c++/${V}/stack
 include/c++/${V}/stacktrace
@@ -911,6 +885,32 @@ include/c++/${V}/valarray
 include/c++/${V}/variant
 include/c++/${V}/vector
 include/c++/${V}/version
+include/c++/${V}/${CONFIG}/
+include/c++/${V}/${CONFIG}/bits/
+include/c++/${V}/${CONFIG}/bits/atomic_word.h
+include/c++/${V}/${CONFIG}/bits/basic_file.h
+include/c++/${V}/${CONFIG}/bits/c++allocator.h
+include/c++/${V}/${CONFIG}/bits/c++config.h
+include/c++/${V}/${CONFIG}/bits/c++io.h
+include/c++/${V}/${CONFIG}/bits/c++locale.h
+include/c++/${V}/${CONFIG}/bits/cpu_defines.h
+include/c++/${V}/${CONFIG}/bits/ctype_base.h
+include/c++/${V}/${CONFIG}/bits/ctype_inline.h
+include/c++/${V}/${CONFIG}/bits/cxxabi_tweaks.h
+include/c++/${V}/${CONFIG}/bits/error_constants.h
+include/c++/${V}/${CONFIG}/bits/extc++.h
+include/c++/${V}/${CONFIG}/bits/gthr-default.h
+include/c++/${V}/${CONFIG}/bits/gthr-posix.h
+include/c++/${V}/${CONFIG}/bits/gthr-single.h
+include/c++/${V}/${CONFIG}/bits/gthr.h
+include/c++/${V}/${CONFIG}/bits/messages_members.h
+include/c++/${V}/${CONFIG}/bits/opt_random.h
+include/c++/${V}/${CONFIG}/bits/os_defines.h
+include/c++/${V}/${CONFIG}/bits/stdc++.h
+include/c++/${V}/${CONFIG}/bits/stdtr1c++.h
+include/c++/${V}/${CONFIG}/bits/time_members.h
+include/c++/${V}/${CONFIG}/ext/
+include/c++/${V}/${CONFIG}/ext/opt_random.h
 @static-lib lib/libestdc++.a
 @static-lib lib/libesupc++.a
 lib/libesupc++.la
diff --git a/lang/gcc/16/pkg/PLIST-libs b/lang/gcc/16/pkg/PLIST-libs
index f63877346bd..2acfcaeb854 100644
--- a/lang/gcc/16/pkg/PLIST-libs
+++ b/lang/gcc/16/pkg/PLIST-libs
@@ -11,7 +11,7 @@ lib/libestdc++.la
 lib/libestdc++.so.22.0-gdb.py
 lib/libgfortran.la
 @lib lib/libgfortran.so.${LIBgfortran_VERSION}
+%%QUADMATH%%
 lib/libobjc.la
 @lib lib/libobjc.so.${LIBobjc_VERSION}
 %%ITM%%
-%%QUADMATH%%
diff --git a/lang/gcc/16/pkg/PLIST-main b/lang/gcc/16/pkg/PLIST-main
index b20eaf40aa7..650142e4448 100644
--- a/lang/gcc/16/pkg/PLIST-main
+++ b/lang/gcc/16/pkg/PLIST-main
@@ -21,7 +21,6 @@
 @info info/gcc.info
 @info info/gccinstall.info
 @info info/gccint.info
-@info info/libquadmath.info
 lib/gcc/
 lib/gcc/${CONFIG}/
 lib/gcc/${CONFIG}/${V}/
@@ -35,8 +34,9 @@ lib/gcc/${CONFIG}/${V}/include/stdatomic.h
 lib/gcc/${CONFIG}/${V}/include/stdfix.h
 lib/gcc/${CONFIG}/${V}/include/stdnoreturn.h
 lib/gcc/${CONFIG}/${V}/include/syslimits.h
+lib/gcc/${CONFIG}/${V}/include/tgmath.h
+lib/gcc/${CONFIG}/${V}/include/unwind.h
 %%ITM%%
-%%QUADMATH%%
 lib/gcc/${CONFIG}/${V}/install-tools/
 lib/gcc/${CONFIG}/${V}/install-tools/fixinc_list
 lib/gcc/${CONFIG}/${V}/install-tools/gsyslimits.h
@@ -156,12 +156,16 @@ lib/gcc/${CONFIG}/${V}/plugin/include/color-macros.h
 lib/gcc/${CONFIG}/${V}/plugin/include/conditions.h
 lib/gcc/${CONFIG}/${V}/plugin/include/config/
 lib/gcc/${CONFIG}/${V}/plugin/include/config.h
+lib/gcc/${CONFIG}/${V}/plugin/include/config/elfos.h
+lib/gcc/${CONFIG}/${V}/plugin/include/config/initfini-array.h
+lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd-libpthread.h
+lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd-stdint.h
+lib/gcc/${CONFIG}/${V}/plugin/include/config/openbsd.h
 %%aarch64%%
 %%alpha%%
 %%amd64%%
 %%arm%%
 %%hppa%%
-%%i386%%
 %%mips64%%
 %%mips64el%%
 %%powerpc%%
@@ -672,6 +676,7 @@ lib/gcc/${CONFIG}/${V}/plugin/libcp1plugin.la
 @lib lib/gcc/${CONFIG}/${V}/plugin/libcp1plugin.so.${LIBcp1plugin_VERSION}
 @static-lib lib/libatomic.a
 @static-lib lib/libatomic_asneeded.a
+%%QUADMATH%%
 lib/libstdc++.modules.json
 @static-lib lib/libstdc++exp.a
 lib/libstdc++exp.la