diff --git a/cross-aarch64-gcc7.changes b/cross-aarch64-gcc7.changes
index 25f848d..0ec510e 100644
--- a/cross-aarch64-gcc7.changes
+++ b/cross-aarch64-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 15 12:24:39 UTC 2018 - rguenther@suse.com
+
+- Handle new debug sources filelist variant debugsourcefiles.list.
+- Prune libstdc++ includes for crosses.
+
 -------------------------------------------------------------------
 Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-aarch64-gcc7.spec b/cross-aarch64-gcc7.spec
index fb414cc..1d64fcd 100644
--- a/cross-aarch64-gcc7.spec
+++ b/cross-aarch64-gcc7.spec
@@ -599,12 +599,22 @@ export NO_BRP_STRIP_DEBUG=true
 export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
+: >../debugsourcefiles.list
 : >../debugsources.list
 # We want shared libraries to reside in the sysroot but the .so symlinks
 # on the host.  Once we have a cross target that has shared libs we need
 # to manually fix up things here like we do for non-cross compilers
 mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot}
 make DESTDIR=$RPM_BUILD_ROOT install-target
+%if %{build_cp}
+# So we installed libstdc++ headers into %prefix where they conflict
+# with other host compilers.  Rip out the non-target specific parts
+# again.
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -mindepth 1 -maxdepth 1 -type d -a -not -name %{gcc_target_arch} | xargs rm -r
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -maxdepth 1 -type f | xargs rm
+# And also remove installed pretty printers which conflict in similar ways
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/gcc%{binsuffix}
+%endif
 %endif
 %endif
 
@@ -676,7 +686,7 @@ rm -r env
 %if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
-%if 0%{build_cp}
+%if %{build_cp}
           c++ g++ \
 %endif
           gcc-ar gcc-nm gcc-ranlib gcov gcov-dump gcov-tool; do
@@ -688,7 +698,7 @@ done
 %{_sbindir}/update-alternatives \
   --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
   --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
-%if 0%{build_cp}
+%if %{build_cp}
   --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
   --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
 %endif
@@ -737,13 +747,14 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
-%if 0%{build_cp}
+%if %{build_cp}
 %{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-c++
 %{_prefix}/bin/%{gcc_target_arch}-g++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-c++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-g++
+%{_prefix}/include/c++
 %endif
 %endif
 %dir %{targetlibsubdir}
diff --git a/cross-arm-gcc7.changes b/cross-arm-gcc7.changes
index 25f848d..0ec510e 100644
--- a/cross-arm-gcc7.changes
+++ b/cross-arm-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 15 12:24:39 UTC 2018 - rguenther@suse.com
+
+- Handle new debug sources filelist variant debugsourcefiles.list.
+- Prune libstdc++ includes for crosses.
+
 -------------------------------------------------------------------
 Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-arm-gcc7.spec b/cross-arm-gcc7.spec
index 9160de5..ecf394b 100644
--- a/cross-arm-gcc7.spec
+++ b/cross-arm-gcc7.spec
@@ -599,12 +599,22 @@ export NO_BRP_STRIP_DEBUG=true
 export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
+: >../debugsourcefiles.list
 : >../debugsources.list
 # We want shared libraries to reside in the sysroot but the .so symlinks
 # on the host.  Once we have a cross target that has shared libs we need
 # to manually fix up things here like we do for non-cross compilers
 mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot}
 make DESTDIR=$RPM_BUILD_ROOT install-target
+%if %{build_cp}
+# So we installed libstdc++ headers into %prefix where they conflict
+# with other host compilers.  Rip out the non-target specific parts
+# again.
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -mindepth 1 -maxdepth 1 -type d -a -not -name %{gcc_target_arch} | xargs rm -r
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -maxdepth 1 -type f | xargs rm
+# And also remove installed pretty printers which conflict in similar ways
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/gcc%{binsuffix}
+%endif
 %endif
 %endif
 
@@ -676,7 +686,7 @@ rm -r env
 %if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
-%if 0%{build_cp}
+%if %{build_cp}
           c++ g++ \
 %endif
           gcc-ar gcc-nm gcc-ranlib gcov gcov-dump gcov-tool; do
@@ -688,7 +698,7 @@ done
 %{_sbindir}/update-alternatives \
   --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
   --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
-%if 0%{build_cp}
+%if %{build_cp}
   --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
   --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
 %endif
@@ -737,13 +747,14 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
-%if 0%{build_cp}
+%if %{build_cp}
 %{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-c++
 %{_prefix}/bin/%{gcc_target_arch}-g++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-c++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-g++
+%{_prefix}/include/c++
 %endif
 %endif
 %dir %{targetlibsubdir}
diff --git a/cross-avr-gcc7-bootstrap.changes b/cross-avr-gcc7-bootstrap.changes
index 25f848d..0ec510e 100644
--- a/cross-avr-gcc7-bootstrap.changes
+++ b/cross-avr-gcc7-bootstrap.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 15 12:24:39 UTC 2018 - rguenther@suse.com
+
+- Handle new debug sources filelist variant debugsourcefiles.list.
+- Prune libstdc++ includes for crosses.
+
 -------------------------------------------------------------------
 Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-avr-gcc7-bootstrap.spec b/cross-avr-gcc7-bootstrap.spec
index 2f8b53b..30b24b4 100644
--- a/cross-avr-gcc7-bootstrap.spec
+++ b/cross-avr-gcc7-bootstrap.spec
@@ -599,12 +599,22 @@ export NO_BRP_STRIP_DEBUG=true
 export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
+: >../debugsourcefiles.list
 : >../debugsources.list
 # We want shared libraries to reside in the sysroot but the .so symlinks
 # on the host.  Once we have a cross target that has shared libs we need
 # to manually fix up things here like we do for non-cross compilers
 mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot}
 make DESTDIR=$RPM_BUILD_ROOT install-target
+%if %{build_cp}
+# So we installed libstdc++ headers into %prefix where they conflict
+# with other host compilers.  Rip out the non-target specific parts
+# again.
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -mindepth 1 -maxdepth 1 -type d -a -not -name %{gcc_target_arch} | xargs rm -r
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -maxdepth 1 -type f | xargs rm
+# And also remove installed pretty printers which conflict in similar ways
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/gcc%{binsuffix}
+%endif
 %endif
 %endif
 
@@ -676,7 +686,7 @@ rm -r env
 %if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
-%if 0%{build_cp}
+%if %{build_cp}
           c++ g++ \
 %endif
           gcc-ar gcc-nm gcc-ranlib gcov gcov-dump gcov-tool; do
@@ -688,7 +698,7 @@ done
 %{_sbindir}/update-alternatives \
   --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
   --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
-%if 0%{build_cp}
+%if %{build_cp}
   --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
   --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
 %endif
@@ -737,13 +747,14 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
-%if 0%{build_cp}
+%if %{build_cp}
 %{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-c++
 %{_prefix}/bin/%{gcc_target_arch}-g++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-c++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-g++
+%{_prefix}/include/c++
 %endif
 %endif
 %dir %{targetlibsubdir}
diff --git a/cross-avr-gcc7.changes b/cross-avr-gcc7.changes
index 25f848d..0ec510e 100644
--- a/cross-avr-gcc7.changes
+++ b/cross-avr-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 15 12:24:39 UTC 2018 - rguenther@suse.com
+
+- Handle new debug sources filelist variant debugsourcefiles.list.
+- Prune libstdc++ includes for crosses.
+
 -------------------------------------------------------------------
 Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-avr-gcc7.spec b/cross-avr-gcc7.spec
index 151a22b..edcfda0 100644
--- a/cross-avr-gcc7.spec
+++ b/cross-avr-gcc7.spec
@@ -599,12 +599,22 @@ export NO_BRP_STRIP_DEBUG=true
 export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
+: >../debugsourcefiles.list
 : >../debugsources.list
 # We want shared libraries to reside in the sysroot but the .so symlinks
 # on the host.  Once we have a cross target that has shared libs we need
 # to manually fix up things here like we do for non-cross compilers
 mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot}
 make DESTDIR=$RPM_BUILD_ROOT install-target
+%if %{build_cp}
+# So we installed libstdc++ headers into %prefix where they conflict
+# with other host compilers.  Rip out the non-target specific parts
+# again.
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -mindepth 1 -maxdepth 1 -type d -a -not -name %{gcc_target_arch} | xargs rm -r
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -maxdepth 1 -type f | xargs rm
+# And also remove installed pretty printers which conflict in similar ways
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/gcc%{binsuffix}
+%endif
 %endif
 %endif
 
@@ -676,7 +686,7 @@ rm -r env
 %if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
-%if 0%{build_cp}
+%if %{build_cp}
           c++ g++ \
 %endif
           gcc-ar gcc-nm gcc-ranlib gcov gcov-dump gcov-tool; do
@@ -688,7 +698,7 @@ done
 %{_sbindir}/update-alternatives \
   --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
   --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
-%if 0%{build_cp}
+%if %{build_cp}
   --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
   --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
 %endif
@@ -737,13 +747,14 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
-%if 0%{build_cp}
+%if %{build_cp}
 %{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-c++
 %{_prefix}/bin/%{gcc_target_arch}-g++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-c++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-g++
+%{_prefix}/include/c++
 %endif
 %endif
 %dir %{targetlibsubdir}
diff --git a/cross-epiphany-gcc7-bootstrap.changes b/cross-epiphany-gcc7-bootstrap.changes
index 25f848d..0ec510e 100644
--- a/cross-epiphany-gcc7-bootstrap.changes
+++ b/cross-epiphany-gcc7-bootstrap.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 15 12:24:39 UTC 2018 - rguenther@suse.com
+
+- Handle new debug sources filelist variant debugsourcefiles.list.
+- Prune libstdc++ includes for crosses.
+
 -------------------------------------------------------------------
 Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-epiphany-gcc7-bootstrap.spec b/cross-epiphany-gcc7-bootstrap.spec
index 12eb354..5ede3af 100644
--- a/cross-epiphany-gcc7-bootstrap.spec
+++ b/cross-epiphany-gcc7-bootstrap.spec
@@ -600,12 +600,22 @@ export NO_BRP_STRIP_DEBUG=true
 export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
+: >../debugsourcefiles.list
 : >../debugsources.list
 # We want shared libraries to reside in the sysroot but the .so symlinks
 # on the host.  Once we have a cross target that has shared libs we need
 # to manually fix up things here like we do for non-cross compilers
 mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot}
 make DESTDIR=$RPM_BUILD_ROOT install-target
+%if %{build_cp}
+# So we installed libstdc++ headers into %prefix where they conflict
+# with other host compilers.  Rip out the non-target specific parts
+# again.
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -mindepth 1 -maxdepth 1 -type d -a -not -name %{gcc_target_arch} | xargs rm -r
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -maxdepth 1 -type f | xargs rm
+# And also remove installed pretty printers which conflict in similar ways
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/gcc%{binsuffix}
+%endif
 %endif
 %endif
 
@@ -677,7 +687,7 @@ rm -r env
 %if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
-%if 0%{build_cp}
+%if %{build_cp}
           c++ g++ \
 %endif
           gcc-ar gcc-nm gcc-ranlib gcov gcov-dump gcov-tool; do
@@ -689,7 +699,7 @@ done
 %{_sbindir}/update-alternatives \
   --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
   --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
-%if 0%{build_cp}
+%if %{build_cp}
   --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
   --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
 %endif
@@ -738,13 +748,14 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
-%if 0%{build_cp}
+%if %{build_cp}
 %{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-c++
 %{_prefix}/bin/%{gcc_target_arch}-g++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-c++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-g++
+%{_prefix}/include/c++
 %endif
 %endif
 %dir %{targetlibsubdir}
diff --git a/cross-epiphany-gcc7.changes b/cross-epiphany-gcc7.changes
index 25f848d..0ec510e 100644
--- a/cross-epiphany-gcc7.changes
+++ b/cross-epiphany-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 15 12:24:39 UTC 2018 - rguenther@suse.com
+
+- Handle new debug sources filelist variant debugsourcefiles.list.
+- Prune libstdc++ includes for crosses.
+
 -------------------------------------------------------------------
 Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-epiphany-gcc7.spec b/cross-epiphany-gcc7.spec
index 041b5e4..35f6718 100644
--- a/cross-epiphany-gcc7.spec
+++ b/cross-epiphany-gcc7.spec
@@ -599,12 +599,22 @@ export NO_BRP_STRIP_DEBUG=true
 export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
+: >../debugsourcefiles.list
 : >../debugsources.list
 # We want shared libraries to reside in the sysroot but the .so symlinks
 # on the host.  Once we have a cross target that has shared libs we need
 # to manually fix up things here like we do for non-cross compilers
 mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot}
 make DESTDIR=$RPM_BUILD_ROOT install-target
+%if %{build_cp}
+# So we installed libstdc++ headers into %prefix where they conflict
+# with other host compilers.  Rip out the non-target specific parts
+# again.
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -mindepth 1 -maxdepth 1 -type d -a -not -name %{gcc_target_arch} | xargs rm -r
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -maxdepth 1 -type f | xargs rm
+# And also remove installed pretty printers which conflict in similar ways
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/gcc%{binsuffix}
+%endif
 %endif
 %endif
 
@@ -676,7 +686,7 @@ rm -r env
 %if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
-%if 0%{build_cp}
+%if %{build_cp}
           c++ g++ \
 %endif
           gcc-ar gcc-nm gcc-ranlib gcov gcov-dump gcov-tool; do
@@ -688,7 +698,7 @@ done
 %{_sbindir}/update-alternatives \
   --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
   --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
-%if 0%{build_cp}
+%if %{build_cp}
   --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
   --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
 %endif
@@ -737,13 +747,14 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
-%if 0%{build_cp}
+%if %{build_cp}
 %{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-c++
 %{_prefix}/bin/%{gcc_target_arch}-g++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-c++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-g++
+%{_prefix}/include/c++
 %endif
 %endif
 %dir %{targetlibsubdir}
diff --git a/cross-hppa-gcc7.changes b/cross-hppa-gcc7.changes
index 25f848d..0ec510e 100644
--- a/cross-hppa-gcc7.changes
+++ b/cross-hppa-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 15 12:24:39 UTC 2018 - rguenther@suse.com
+
+- Handle new debug sources filelist variant debugsourcefiles.list.
+- Prune libstdc++ includes for crosses.
+
 -------------------------------------------------------------------
 Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-hppa-gcc7.spec b/cross-hppa-gcc7.spec
index 02494d4..708ef98 100644
--- a/cross-hppa-gcc7.spec
+++ b/cross-hppa-gcc7.spec
@@ -599,12 +599,22 @@ export NO_BRP_STRIP_DEBUG=true
 export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
+: >../debugsourcefiles.list
 : >../debugsources.list
 # We want shared libraries to reside in the sysroot but the .so symlinks
 # on the host.  Once we have a cross target that has shared libs we need
 # to manually fix up things here like we do for non-cross compilers
 mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot}
 make DESTDIR=$RPM_BUILD_ROOT install-target
+%if %{build_cp}
+# So we installed libstdc++ headers into %prefix where they conflict
+# with other host compilers.  Rip out the non-target specific parts
+# again.
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -mindepth 1 -maxdepth 1 -type d -a -not -name %{gcc_target_arch} | xargs rm -r
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -maxdepth 1 -type f | xargs rm
+# And also remove installed pretty printers which conflict in similar ways
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/gcc%{binsuffix}
+%endif
 %endif
 %endif
 
@@ -676,7 +686,7 @@ rm -r env
 %if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
-%if 0%{build_cp}
+%if %{build_cp}
           c++ g++ \
 %endif
           gcc-ar gcc-nm gcc-ranlib gcov gcov-dump gcov-tool; do
@@ -688,7 +698,7 @@ done
 %{_sbindir}/update-alternatives \
   --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
   --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
-%if 0%{build_cp}
+%if %{build_cp}
   --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
   --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
 %endif
@@ -737,13 +747,14 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
-%if 0%{build_cp}
+%if %{build_cp}
 %{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-c++
 %{_prefix}/bin/%{gcc_target_arch}-g++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-c++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-g++
+%{_prefix}/include/c++
 %endif
 %endif
 %dir %{targetlibsubdir}
diff --git a/cross-i386-gcc7.changes b/cross-i386-gcc7.changes
index 25f848d..0ec510e 100644
--- a/cross-i386-gcc7.changes
+++ b/cross-i386-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 15 12:24:39 UTC 2018 - rguenther@suse.com
+
+- Handle new debug sources filelist variant debugsourcefiles.list.
+- Prune libstdc++ includes for crosses.
+
 -------------------------------------------------------------------
 Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-i386-gcc7.spec b/cross-i386-gcc7.spec
index eba9880..1218f7e 100644
--- a/cross-i386-gcc7.spec
+++ b/cross-i386-gcc7.spec
@@ -599,12 +599,22 @@ export NO_BRP_STRIP_DEBUG=true
 export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
+: >../debugsourcefiles.list
 : >../debugsources.list
 # We want shared libraries to reside in the sysroot but the .so symlinks
 # on the host.  Once we have a cross target that has shared libs we need
 # to manually fix up things here like we do for non-cross compilers
 mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot}
 make DESTDIR=$RPM_BUILD_ROOT install-target
+%if %{build_cp}
+# So we installed libstdc++ headers into %prefix where they conflict
+# with other host compilers.  Rip out the non-target specific parts
+# again.
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -mindepth 1 -maxdepth 1 -type d -a -not -name %{gcc_target_arch} | xargs rm -r
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -maxdepth 1 -type f | xargs rm
+# And also remove installed pretty printers which conflict in similar ways
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/gcc%{binsuffix}
+%endif
 %endif
 %endif
 
@@ -676,7 +686,7 @@ rm -r env
 %if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
-%if 0%{build_cp}
+%if %{build_cp}
           c++ g++ \
 %endif
           gcc-ar gcc-nm gcc-ranlib gcov gcov-dump gcov-tool; do
@@ -688,7 +698,7 @@ done
 %{_sbindir}/update-alternatives \
   --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
   --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
-%if 0%{build_cp}
+%if %{build_cp}
   --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
   --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
 %endif
@@ -737,13 +747,14 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
-%if 0%{build_cp}
+%if %{build_cp}
 %{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-c++
 %{_prefix}/bin/%{gcc_target_arch}-g++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-c++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-g++
+%{_prefix}/include/c++
 %endif
 %endif
 %dir %{targetlibsubdir}
diff --git a/cross-m68k-gcc7.changes b/cross-m68k-gcc7.changes
index 25f848d..0ec510e 100644
--- a/cross-m68k-gcc7.changes
+++ b/cross-m68k-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 15 12:24:39 UTC 2018 - rguenther@suse.com
+
+- Handle new debug sources filelist variant debugsourcefiles.list.
+- Prune libstdc++ includes for crosses.
+
 -------------------------------------------------------------------
 Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-m68k-gcc7.spec b/cross-m68k-gcc7.spec
index 301d9ed..6499041 100644
--- a/cross-m68k-gcc7.spec
+++ b/cross-m68k-gcc7.spec
@@ -599,12 +599,22 @@ export NO_BRP_STRIP_DEBUG=true
 export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
+: >../debugsourcefiles.list
 : >../debugsources.list
 # We want shared libraries to reside in the sysroot but the .so symlinks
 # on the host.  Once we have a cross target that has shared libs we need
 # to manually fix up things here like we do for non-cross compilers
 mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot}
 make DESTDIR=$RPM_BUILD_ROOT install-target
+%if %{build_cp}
+# So we installed libstdc++ headers into %prefix where they conflict
+# with other host compilers.  Rip out the non-target specific parts
+# again.
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -mindepth 1 -maxdepth 1 -type d -a -not -name %{gcc_target_arch} | xargs rm -r
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -maxdepth 1 -type f | xargs rm
+# And also remove installed pretty printers which conflict in similar ways
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/gcc%{binsuffix}
+%endif
 %endif
 %endif
 
@@ -676,7 +686,7 @@ rm -r env
 %if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
-%if 0%{build_cp}
+%if %{build_cp}
           c++ g++ \
 %endif
           gcc-ar gcc-nm gcc-ranlib gcov gcov-dump gcov-tool; do
@@ -688,7 +698,7 @@ done
 %{_sbindir}/update-alternatives \
   --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
   --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
-%if 0%{build_cp}
+%if %{build_cp}
   --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
   --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
 %endif
@@ -737,13 +747,14 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
-%if 0%{build_cp}
+%if %{build_cp}
 %{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-c++
 %{_prefix}/bin/%{gcc_target_arch}-g++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-c++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-g++
+%{_prefix}/include/c++
 %endif
 %endif
 %dir %{targetlibsubdir}
diff --git a/cross-mips-gcc7.changes b/cross-mips-gcc7.changes
index 25f848d..0ec510e 100644
--- a/cross-mips-gcc7.changes
+++ b/cross-mips-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 15 12:24:39 UTC 2018 - rguenther@suse.com
+
+- Handle new debug sources filelist variant debugsourcefiles.list.
+- Prune libstdc++ includes for crosses.
+
 -------------------------------------------------------------------
 Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-mips-gcc7.spec b/cross-mips-gcc7.spec
index ed6eceb..57443bd 100644
--- a/cross-mips-gcc7.spec
+++ b/cross-mips-gcc7.spec
@@ -599,12 +599,22 @@ export NO_BRP_STRIP_DEBUG=true
 export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
+: >../debugsourcefiles.list
 : >../debugsources.list
 # We want shared libraries to reside in the sysroot but the .so symlinks
 # on the host.  Once we have a cross target that has shared libs we need
 # to manually fix up things here like we do for non-cross compilers
 mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot}
 make DESTDIR=$RPM_BUILD_ROOT install-target
+%if %{build_cp}
+# So we installed libstdc++ headers into %prefix where they conflict
+# with other host compilers.  Rip out the non-target specific parts
+# again.
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -mindepth 1 -maxdepth 1 -type d -a -not -name %{gcc_target_arch} | xargs rm -r
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -maxdepth 1 -type f | xargs rm
+# And also remove installed pretty printers which conflict in similar ways
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/gcc%{binsuffix}
+%endif
 %endif
 %endif
 
@@ -676,7 +686,7 @@ rm -r env
 %if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
-%if 0%{build_cp}
+%if %{build_cp}
           c++ g++ \
 %endif
           gcc-ar gcc-nm gcc-ranlib gcov gcov-dump gcov-tool; do
@@ -688,7 +698,7 @@ done
 %{_sbindir}/update-alternatives \
   --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
   --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
-%if 0%{build_cp}
+%if %{build_cp}
   --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
   --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
 %endif
@@ -737,13 +747,14 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
-%if 0%{build_cp}
+%if %{build_cp}
 %{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-c++
 %{_prefix}/bin/%{gcc_target_arch}-g++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-c++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-g++
+%{_prefix}/include/c++
 %endif
 %endif
 %dir %{targetlibsubdir}
diff --git a/cross-nvptx-gcc7.changes b/cross-nvptx-gcc7.changes
index 25f848d..0ec510e 100644
--- a/cross-nvptx-gcc7.changes
+++ b/cross-nvptx-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 15 12:24:39 UTC 2018 - rguenther@suse.com
+
+- Handle new debug sources filelist variant debugsourcefiles.list.
+- Prune libstdc++ includes for crosses.
+
 -------------------------------------------------------------------
 Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-nvptx-gcc7.spec b/cross-nvptx-gcc7.spec
index fbc88fe..a258547 100644
--- a/cross-nvptx-gcc7.spec
+++ b/cross-nvptx-gcc7.spec
@@ -599,12 +599,22 @@ export NO_BRP_STRIP_DEBUG=true
 export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
+: >../debugsourcefiles.list
 : >../debugsources.list
 # We want shared libraries to reside in the sysroot but the .so symlinks
 # on the host.  Once we have a cross target that has shared libs we need
 # to manually fix up things here like we do for non-cross compilers
 mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot}
 make DESTDIR=$RPM_BUILD_ROOT install-target
+%if %{build_cp}
+# So we installed libstdc++ headers into %prefix where they conflict
+# with other host compilers.  Rip out the non-target specific parts
+# again.
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -mindepth 1 -maxdepth 1 -type d -a -not -name %{gcc_target_arch} | xargs rm -r
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -maxdepth 1 -type f | xargs rm
+# And also remove installed pretty printers which conflict in similar ways
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/gcc%{binsuffix}
+%endif
 %endif
 %endif
 
@@ -676,7 +686,7 @@ rm -r env
 %if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
-%if 0%{build_cp}
+%if %{build_cp}
           c++ g++ \
 %endif
           gcc-ar gcc-nm gcc-ranlib gcov gcov-dump gcov-tool; do
@@ -688,7 +698,7 @@ done
 %{_sbindir}/update-alternatives \
   --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
   --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
-%if 0%{build_cp}
+%if %{build_cp}
   --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
   --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
 %endif
@@ -737,13 +747,14 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
-%if 0%{build_cp}
+%if %{build_cp}
 %{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-c++
 %{_prefix}/bin/%{gcc_target_arch}-g++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-c++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-g++
+%{_prefix}/include/c++
 %endif
 %endif
 %dir %{targetlibsubdir}
diff --git a/cross-ppc64-gcc7.changes b/cross-ppc64-gcc7.changes
index 25f848d..0ec510e 100644
--- a/cross-ppc64-gcc7.changes
+++ b/cross-ppc64-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 15 12:24:39 UTC 2018 - rguenther@suse.com
+
+- Handle new debug sources filelist variant debugsourcefiles.list.
+- Prune libstdc++ includes for crosses.
+
 -------------------------------------------------------------------
 Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-ppc64-gcc7.spec b/cross-ppc64-gcc7.spec
index aeac850..965ef12 100644
--- a/cross-ppc64-gcc7.spec
+++ b/cross-ppc64-gcc7.spec
@@ -599,12 +599,22 @@ export NO_BRP_STRIP_DEBUG=true
 export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
+: >../debugsourcefiles.list
 : >../debugsources.list
 # We want shared libraries to reside in the sysroot but the .so symlinks
 # on the host.  Once we have a cross target that has shared libs we need
 # to manually fix up things here like we do for non-cross compilers
 mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot}
 make DESTDIR=$RPM_BUILD_ROOT install-target
+%if %{build_cp}
+# So we installed libstdc++ headers into %prefix where they conflict
+# with other host compilers.  Rip out the non-target specific parts
+# again.
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -mindepth 1 -maxdepth 1 -type d -a -not -name %{gcc_target_arch} | xargs rm -r
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -maxdepth 1 -type f | xargs rm
+# And also remove installed pretty printers which conflict in similar ways
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/gcc%{binsuffix}
+%endif
 %endif
 %endif
 
@@ -676,7 +686,7 @@ rm -r env
 %if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
-%if 0%{build_cp}
+%if %{build_cp}
           c++ g++ \
 %endif
           gcc-ar gcc-nm gcc-ranlib gcov gcov-dump gcov-tool; do
@@ -688,7 +698,7 @@ done
 %{_sbindir}/update-alternatives \
   --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
   --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
-%if 0%{build_cp}
+%if %{build_cp}
   --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
   --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
 %endif
@@ -737,13 +747,14 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
-%if 0%{build_cp}
+%if %{build_cp}
 %{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-c++
 %{_prefix}/bin/%{gcc_target_arch}-g++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-c++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-g++
+%{_prefix}/include/c++
 %endif
 %endif
 %dir %{targetlibsubdir}
diff --git a/cross-ppc64le-gcc7.changes b/cross-ppc64le-gcc7.changes
index 25f848d..0ec510e 100644
--- a/cross-ppc64le-gcc7.changes
+++ b/cross-ppc64le-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 15 12:24:39 UTC 2018 - rguenther@suse.com
+
+- Handle new debug sources filelist variant debugsourcefiles.list.
+- Prune libstdc++ includes for crosses.
+
 -------------------------------------------------------------------
 Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-ppc64le-gcc7.spec b/cross-ppc64le-gcc7.spec
index 56cdcf8..2a8ce8f 100644
--- a/cross-ppc64le-gcc7.spec
+++ b/cross-ppc64le-gcc7.spec
@@ -599,12 +599,22 @@ export NO_BRP_STRIP_DEBUG=true
 export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
+: >../debugsourcefiles.list
 : >../debugsources.list
 # We want shared libraries to reside in the sysroot but the .so symlinks
 # on the host.  Once we have a cross target that has shared libs we need
 # to manually fix up things here like we do for non-cross compilers
 mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot}
 make DESTDIR=$RPM_BUILD_ROOT install-target
+%if %{build_cp}
+# So we installed libstdc++ headers into %prefix where they conflict
+# with other host compilers.  Rip out the non-target specific parts
+# again.
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -mindepth 1 -maxdepth 1 -type d -a -not -name %{gcc_target_arch} | xargs rm -r
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -maxdepth 1 -type f | xargs rm
+# And also remove installed pretty printers which conflict in similar ways
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/gcc%{binsuffix}
+%endif
 %endif
 %endif
 
@@ -676,7 +686,7 @@ rm -r env
 %if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
-%if 0%{build_cp}
+%if %{build_cp}
           c++ g++ \
 %endif
           gcc-ar gcc-nm gcc-ranlib gcov gcov-dump gcov-tool; do
@@ -688,7 +698,7 @@ done
 %{_sbindir}/update-alternatives \
   --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
   --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
-%if 0%{build_cp}
+%if %{build_cp}
   --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
   --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
 %endif
@@ -737,13 +747,14 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
-%if 0%{build_cp}
+%if %{build_cp}
 %{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-c++
 %{_prefix}/bin/%{gcc_target_arch}-g++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-c++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-g++
+%{_prefix}/include/c++
 %endif
 %endif
 %dir %{targetlibsubdir}
diff --git a/cross-rx-gcc7-bootstrap.changes b/cross-rx-gcc7-bootstrap.changes
index 25f848d..0ec510e 100644
--- a/cross-rx-gcc7-bootstrap.changes
+++ b/cross-rx-gcc7-bootstrap.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 15 12:24:39 UTC 2018 - rguenther@suse.com
+
+- Handle new debug sources filelist variant debugsourcefiles.list.
+- Prune libstdc++ includes for crosses.
+
 -------------------------------------------------------------------
 Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-rx-gcc7-bootstrap.spec b/cross-rx-gcc7-bootstrap.spec
index 7ab362b..8a83738 100644
--- a/cross-rx-gcc7-bootstrap.spec
+++ b/cross-rx-gcc7-bootstrap.spec
@@ -600,12 +600,22 @@ export NO_BRP_STRIP_DEBUG=true
 export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
+: >../debugsourcefiles.list
 : >../debugsources.list
 # We want shared libraries to reside in the sysroot but the .so symlinks
 # on the host.  Once we have a cross target that has shared libs we need
 # to manually fix up things here like we do for non-cross compilers
 mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot}
 make DESTDIR=$RPM_BUILD_ROOT install-target
+%if %{build_cp}
+# So we installed libstdc++ headers into %prefix where they conflict
+# with other host compilers.  Rip out the non-target specific parts
+# again.
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -mindepth 1 -maxdepth 1 -type d -a -not -name %{gcc_target_arch} | xargs rm -r
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -maxdepth 1 -type f | xargs rm
+# And also remove installed pretty printers which conflict in similar ways
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/gcc%{binsuffix}
+%endif
 %endif
 %endif
 
@@ -677,7 +687,7 @@ rm -r env
 %if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
-%if 0%{build_cp}
+%if %{build_cp}
           c++ g++ \
 %endif
           gcc-ar gcc-nm gcc-ranlib gcov gcov-dump gcov-tool; do
@@ -689,7 +699,7 @@ done
 %{_sbindir}/update-alternatives \
   --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
   --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
-%if 0%{build_cp}
+%if %{build_cp}
   --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
   --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
 %endif
@@ -738,13 +748,14 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
-%if 0%{build_cp}
+%if %{build_cp}
 %{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-c++
 %{_prefix}/bin/%{gcc_target_arch}-g++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-c++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-g++
+%{_prefix}/include/c++
 %endif
 %endif
 %dir %{targetlibsubdir}
diff --git a/cross-rx-gcc7.changes b/cross-rx-gcc7.changes
index 25f848d..0ec510e 100644
--- a/cross-rx-gcc7.changes
+++ b/cross-rx-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 15 12:24:39 UTC 2018 - rguenther@suse.com
+
+- Handle new debug sources filelist variant debugsourcefiles.list.
+- Prune libstdc++ includes for crosses.
+
 -------------------------------------------------------------------
 Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-rx-gcc7.spec b/cross-rx-gcc7.spec
index 17ae9c0..7198a3e 100644
--- a/cross-rx-gcc7.spec
+++ b/cross-rx-gcc7.spec
@@ -599,12 +599,22 @@ export NO_BRP_STRIP_DEBUG=true
 export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
+: >../debugsourcefiles.list
 : >../debugsources.list
 # We want shared libraries to reside in the sysroot but the .so symlinks
 # on the host.  Once we have a cross target that has shared libs we need
 # to manually fix up things here like we do for non-cross compilers
 mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot}
 make DESTDIR=$RPM_BUILD_ROOT install-target
+%if %{build_cp}
+# So we installed libstdc++ headers into %prefix where they conflict
+# with other host compilers.  Rip out the non-target specific parts
+# again.
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -mindepth 1 -maxdepth 1 -type d -a -not -name %{gcc_target_arch} | xargs rm -r
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -maxdepth 1 -type f | xargs rm
+# And also remove installed pretty printers which conflict in similar ways
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/gcc%{binsuffix}
+%endif
 %endif
 %endif
 
@@ -676,7 +686,7 @@ rm -r env
 %if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
-%if 0%{build_cp}
+%if %{build_cp}
           c++ g++ \
 %endif
           gcc-ar gcc-nm gcc-ranlib gcov gcov-dump gcov-tool; do
@@ -688,7 +698,7 @@ done
 %{_sbindir}/update-alternatives \
   --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
   --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
-%if 0%{build_cp}
+%if %{build_cp}
   --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
   --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
 %endif
@@ -737,13 +747,14 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
-%if 0%{build_cp}
+%if %{build_cp}
 %{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-c++
 %{_prefix}/bin/%{gcc_target_arch}-g++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-c++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-g++
+%{_prefix}/include/c++
 %endif
 %endif
 %dir %{targetlibsubdir}
diff --git a/cross-s390x-gcc7.changes b/cross-s390x-gcc7.changes
index 25f848d..0ec510e 100644
--- a/cross-s390x-gcc7.changes
+++ b/cross-s390x-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 15 12:24:39 UTC 2018 - rguenther@suse.com
+
+- Handle new debug sources filelist variant debugsourcefiles.list.
+- Prune libstdc++ includes for crosses.
+
 -------------------------------------------------------------------
 Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-s390x-gcc7.spec b/cross-s390x-gcc7.spec
index 67d4b9b..97045d6 100644
--- a/cross-s390x-gcc7.spec
+++ b/cross-s390x-gcc7.spec
@@ -599,12 +599,22 @@ export NO_BRP_STRIP_DEBUG=true
 export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
+: >../debugsourcefiles.list
 : >../debugsources.list
 # We want shared libraries to reside in the sysroot but the .so symlinks
 # on the host.  Once we have a cross target that has shared libs we need
 # to manually fix up things here like we do for non-cross compilers
 mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot}
 make DESTDIR=$RPM_BUILD_ROOT install-target
+%if %{build_cp}
+# So we installed libstdc++ headers into %prefix where they conflict
+# with other host compilers.  Rip out the non-target specific parts
+# again.
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -mindepth 1 -maxdepth 1 -type d -a -not -name %{gcc_target_arch} | xargs rm -r
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -maxdepth 1 -type f | xargs rm
+# And also remove installed pretty printers which conflict in similar ways
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/gcc%{binsuffix}
+%endif
 %endif
 %endif
 
@@ -676,7 +686,7 @@ rm -r env
 %if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
-%if 0%{build_cp}
+%if %{build_cp}
           c++ g++ \
 %endif
           gcc-ar gcc-nm gcc-ranlib gcov gcov-dump gcov-tool; do
@@ -688,7 +698,7 @@ done
 %{_sbindir}/update-alternatives \
   --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
   --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
-%if 0%{build_cp}
+%if %{build_cp}
   --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
   --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
 %endif
@@ -737,13 +747,14 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
-%if 0%{build_cp}
+%if %{build_cp}
 %{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-c++
 %{_prefix}/bin/%{gcc_target_arch}-g++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-c++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-g++
+%{_prefix}/include/c++
 %endif
 %endif
 %dir %{targetlibsubdir}
diff --git a/cross-sparc-gcc7.changes b/cross-sparc-gcc7.changes
index 25f848d..0ec510e 100644
--- a/cross-sparc-gcc7.changes
+++ b/cross-sparc-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 15 12:24:39 UTC 2018 - rguenther@suse.com
+
+- Handle new debug sources filelist variant debugsourcefiles.list.
+- Prune libstdc++ includes for crosses.
+
 -------------------------------------------------------------------
 Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-sparc-gcc7.spec b/cross-sparc-gcc7.spec
index 8ad8168..31aa35e 100644
--- a/cross-sparc-gcc7.spec
+++ b/cross-sparc-gcc7.spec
@@ -599,12 +599,22 @@ export NO_BRP_STRIP_DEBUG=true
 export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
+: >../debugsourcefiles.list
 : >../debugsources.list
 # We want shared libraries to reside in the sysroot but the .so symlinks
 # on the host.  Once we have a cross target that has shared libs we need
 # to manually fix up things here like we do for non-cross compilers
 mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot}
 make DESTDIR=$RPM_BUILD_ROOT install-target
+%if %{build_cp}
+# So we installed libstdc++ headers into %prefix where they conflict
+# with other host compilers.  Rip out the non-target specific parts
+# again.
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -mindepth 1 -maxdepth 1 -type d -a -not -name %{gcc_target_arch} | xargs rm -r
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -maxdepth 1 -type f | xargs rm
+# And also remove installed pretty printers which conflict in similar ways
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/gcc%{binsuffix}
+%endif
 %endif
 %endif
 
@@ -676,7 +686,7 @@ rm -r env
 %if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
-%if 0%{build_cp}
+%if %{build_cp}
           c++ g++ \
 %endif
           gcc-ar gcc-nm gcc-ranlib gcov gcov-dump gcov-tool; do
@@ -688,7 +698,7 @@ done
 %{_sbindir}/update-alternatives \
   --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
   --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
-%if 0%{build_cp}
+%if %{build_cp}
   --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
   --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
 %endif
@@ -737,13 +747,14 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
-%if 0%{build_cp}
+%if %{build_cp}
 %{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-c++
 %{_prefix}/bin/%{gcc_target_arch}-g++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-c++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-g++
+%{_prefix}/include/c++
 %endif
 %endif
 %dir %{targetlibsubdir}
diff --git a/cross-sparc64-gcc7.changes b/cross-sparc64-gcc7.changes
index 25f848d..0ec510e 100644
--- a/cross-sparc64-gcc7.changes
+++ b/cross-sparc64-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 15 12:24:39 UTC 2018 - rguenther@suse.com
+
+- Handle new debug sources filelist variant debugsourcefiles.list.
+- Prune libstdc++ includes for crosses.
+
 -------------------------------------------------------------------
 Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-sparc64-gcc7.spec b/cross-sparc64-gcc7.spec
index 82c5efb..26cd0c6 100644
--- a/cross-sparc64-gcc7.spec
+++ b/cross-sparc64-gcc7.spec
@@ -599,12 +599,22 @@ export NO_BRP_STRIP_DEBUG=true
 export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
+: >../debugsourcefiles.list
 : >../debugsources.list
 # We want shared libraries to reside in the sysroot but the .so symlinks
 # on the host.  Once we have a cross target that has shared libs we need
 # to manually fix up things here like we do for non-cross compilers
 mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot}
 make DESTDIR=$RPM_BUILD_ROOT install-target
+%if %{build_cp}
+# So we installed libstdc++ headers into %prefix where they conflict
+# with other host compilers.  Rip out the non-target specific parts
+# again.
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -mindepth 1 -maxdepth 1 -type d -a -not -name %{gcc_target_arch} | xargs rm -r
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -maxdepth 1 -type f | xargs rm
+# And also remove installed pretty printers which conflict in similar ways
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/gcc%{binsuffix}
+%endif
 %endif
 %endif
 
@@ -676,7 +686,7 @@ rm -r env
 %if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
-%if 0%{build_cp}
+%if %{build_cp}
           c++ g++ \
 %endif
           gcc-ar gcc-nm gcc-ranlib gcov gcov-dump gcov-tool; do
@@ -688,7 +698,7 @@ done
 %{_sbindir}/update-alternatives \
   --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
   --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
-%if 0%{build_cp}
+%if %{build_cp}
   --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
   --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
 %endif
@@ -737,13 +747,14 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
-%if 0%{build_cp}
+%if %{build_cp}
 %{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-c++
 %{_prefix}/bin/%{gcc_target_arch}-g++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-c++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-g++
+%{_prefix}/include/c++
 %endif
 %endif
 %dir %{targetlibsubdir}
diff --git a/cross-x86_64-gcc7.changes b/cross-x86_64-gcc7.changes
index 25f848d..0ec510e 100644
--- a/cross-x86_64-gcc7.changes
+++ b/cross-x86_64-gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 15 12:24:39 UTC 2018 - rguenther@suse.com
+
+- Handle new debug sources filelist variant debugsourcefiles.list.
+- Prune libstdc++ includes for crosses.
+
 -------------------------------------------------------------------
 Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-x86_64-gcc7.spec b/cross-x86_64-gcc7.spec
index c8605d3..af62e7c 100644
--- a/cross-x86_64-gcc7.spec
+++ b/cross-x86_64-gcc7.spec
@@ -599,12 +599,22 @@ export NO_BRP_STRIP_DEBUG=true
 export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
+: >../debugsourcefiles.list
 : >../debugsources.list
 # We want shared libraries to reside in the sysroot but the .so symlinks
 # on the host.  Once we have a cross target that has shared libs we need
 # to manually fix up things here like we do for non-cross compilers
 mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot}
 make DESTDIR=$RPM_BUILD_ROOT install-target
+%if %{build_cp}
+# So we installed libstdc++ headers into %prefix where they conflict
+# with other host compilers.  Rip out the non-target specific parts
+# again.
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -mindepth 1 -maxdepth 1 -type d -a -not -name %{gcc_target_arch} | xargs rm -r
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -maxdepth 1 -type f | xargs rm
+# And also remove installed pretty printers which conflict in similar ways
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/gcc%{binsuffix}
+%endif
 %endif
 %endif
 
@@ -676,7 +686,7 @@ rm -r env
 %if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
-%if 0%{build_cp}
+%if %{build_cp}
           c++ g++ \
 %endif
           gcc-ar gcc-nm gcc-ranlib gcov gcov-dump gcov-tool; do
@@ -688,7 +698,7 @@ done
 %{_sbindir}/update-alternatives \
   --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} 7 \
   --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
-%if 0%{build_cp}
+%if %{build_cp}
   --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
   --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
 %endif
@@ -737,13 +747,14 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
-%if 0%{build_cp}
+%if %{build_cp}
 %{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-c++
 %{_prefix}/bin/%{gcc_target_arch}-g++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-c++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-g++
+%{_prefix}/include/c++
 %endif
 %endif
 %dir %{targetlibsubdir}
diff --git a/cross.spec.in b/cross.spec.in
index 07f3481..b856e29 100644
--- a/cross.spec.in
+++ b/cross.spec.in
@@ -178,12 +178,22 @@ export NO_BRP_STRIP_DEBUG=true
 export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
+: >../debugsourcefiles.list
 : >../debugsources.list
 # We want shared libraries to reside in the sysroot but the .so symlinks
 # on the host.  Once we have a cross target that has shared libs we need
 # to manually fix up things here like we do for non-cross compilers
 mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot}
 make DESTDIR=$RPM_BUILD_ROOT install-target
+%if %{build_cp}
+# So we installed libstdc++ headers into %prefix where they conflict
+# with other host compilers.  Rip out the non-target specific parts
+# again.
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -mindepth 1 -maxdepth 1 -type d -a -not -name %{gcc_target_arch} | xargs rm -r
+find $RPM_BUILD_ROOT/%_prefix/include/c++/%{gcc_dir_version} -maxdepth 1 -type f | xargs rm
+# And also remove installed pretty printers which conflict in similar ways
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/gcc%{binsuffix}
+%endif
 %endif
 %endif
 
@@ -255,7 +265,7 @@ rm -r env
 %if 0%{!?gcc_accel:1}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for ex in gcc cpp \
-%if 0%{build_cp}
+%if %{build_cp}
           c++ g++ \
 %endif
           gcc-ar gcc-nm gcc-ranlib gcov gcov-dump gcov-tool; do
@@ -267,7 +277,7 @@ done
 %{_sbindir}/update-alternatives \
   --install %{_bindir}/%{gcc_target_arch}-gcc %{gcc_target_arch}-gcc %{_bindir}/%{gcc_target_arch}-gcc%{binsuffix} @base_ver@ \
   --slave %{_bindir}/%{gcc_target_arch}-cpp %{gcc_target_arch}-cpp %{_bindir}/%{gcc_target_arch}-cpp%{binsuffix} \
-%if 0%{build_cp}
+%if %{build_cp}
   --slave %{_bindir}/%{gcc_target_arch}-c++ %{gcc_target_arch}-c++ %{_bindir}/%{gcc_target_arch}-c++%{binsuffix} \
   --slave %{_bindir}/%{gcc_target_arch}-g++ %{gcc_target_arch}-g++ %{_bindir}/%{gcc_target_arch}-g++%{binsuffix} \
 %endif
@@ -316,13 +326,14 @@ fi
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-dump
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-gcov-tool
-%if 0%{build_cp}
+%if %{build_cp}
 %{_prefix}/bin/%{gcc_target_arch}-c++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-g++%{binsuffix}
 %{_prefix}/bin/%{gcc_target_arch}-c++
 %{_prefix}/bin/%{gcc_target_arch}-g++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-c++
 %ghost %{_sysconfdir}/alternatives/%{gcc_target_arch}-g++
+%{_prefix}/include/c++
 %endif
 %endif
 %dir %{targetlibsubdir}
diff --git a/gcc7-testresults.changes b/gcc7-testresults.changes
index 25f848d..0ec510e 100644
--- a/gcc7-testresults.changes
+++ b/gcc7-testresults.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 15 12:24:39 UTC 2018 - rguenther@suse.com
+
+- Handle new debug sources filelist variant debugsourcefiles.list.
+- Prune libstdc++ includes for crosses.
+
 -------------------------------------------------------------------
 Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com
 
diff --git a/gcc7.changes b/gcc7.changes
index 25f848d..0ec510e 100644
--- a/gcc7.changes
+++ b/gcc7.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 15 12:24:39 UTC 2018 - rguenther@suse.com
+
+- Handle new debug sources filelist variant debugsourcefiles.list.
+- Prune libstdc++ includes for crosses.
+
 -------------------------------------------------------------------
 Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com