diff --git a/binutils-bfd_h.patch b/binutils-bfd_h.patch
index de13c26..75982ab 100644
--- a/binutils-bfd_h.patch
+++ b/binutils-bfd_h.patch
@@ -1,8 +1,10 @@
 Remove the #error to avoid issues with legacy not dealing with this
 
---- bfd/bfd-in.h.orig	2012-11-30 13:44:35.715871571 +0100
-+++ bfd/bfd-in.h	2012-11-30 13:44:43.428871298 +0100
-@@ -25,11 +25,6 @@
+Index: bfd/bfd-in.h
+===================================================================
+--- bfd/bfd-in.h.orig
++++ bfd/bfd-in.h
+@@ -23,11 +23,6 @@
  #ifndef __BFD_H_SEEN__
  #define __BFD_H_SEEN__
  
diff --git a/binutils.changes b/binutils.changes
index bbb89cb..a239ca6 100644
--- a/binutils.changes
+++ b/binutils.changes
@@ -3,6 +3,7 @@ Fri Oct  8 14:11:44 UTC 2021 - Michael Matz <matz@suse.com>
 
 - Configure with --disable-x86-used-note on old code streams.
 - Disable libalternatives temporarily for build cycle reasons.
+- make TARGET-bfd=headers again, we patch bfd-in.h
 - This state submitted to SLE12 and SLE15 code streams for annual
   toolchain update. [jsc#PM-2767, jsc#SLE-21561, jsc#SLE-19618]
 - Bump binutils-2.37-branch.diff to 66d5c7003, to include fixes for
diff --git a/binutils.spec b/binutils.spec
index d1b5c80..390dbd7 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -314,6 +314,12 @@ cd build-dir
 %endif
 	--enable-obsolete
 
+# we patch headers (bfd-in.h) that are input to other headers
+# which are generated only with --enable-maintainer-mode (which we
+# don't do) or explicitely by make headers, so do this:
+make %{?_smp_mflags} all-bfd TARGET-bfd=headers
+# force reconfiguring
+rm bfd/Makefile
 make %{?_smp_mflags}
 
 %else
diff --git a/cross-aarch64-binutils.changes b/cross-aarch64-binutils.changes
index bbb89cb..a239ca6 100644
--- a/cross-aarch64-binutils.changes
+++ b/cross-aarch64-binutils.changes
@@ -3,6 +3,7 @@ Fri Oct  8 14:11:44 UTC 2021 - Michael Matz <matz@suse.com>
 
 - Configure with --disable-x86-used-note on old code streams.
 - Disable libalternatives temporarily for build cycle reasons.
+- make TARGET-bfd=headers again, we patch bfd-in.h
 - This state submitted to SLE12 and SLE15 code streams for annual
   toolchain update. [jsc#PM-2767, jsc#SLE-21561, jsc#SLE-19618]
 - Bump binutils-2.37-branch.diff to 66d5c7003, to include fixes for
diff --git a/cross-aarch64-binutils.spec b/cross-aarch64-binutils.spec
index 10ec95d..fc91b77 100644
--- a/cross-aarch64-binutils.spec
+++ b/cross-aarch64-binutils.spec
@@ -317,6 +317,12 @@ cd build-dir
 %endif
 	--enable-obsolete
 
+# we patch headers (bfd-in.h) that are input to other headers
+# which are generated only with --enable-maintainer-mode (which we
+# don't do) or explicitely by make headers, so do this:
+make %{?_smp_mflags} all-bfd TARGET-bfd=headers
+# force reconfiguring
+rm bfd/Makefile
 make %{?_smp_mflags}
 
 %else
diff --git a/cross-arm-binutils.changes b/cross-arm-binutils.changes
index bbb89cb..a239ca6 100644
--- a/cross-arm-binutils.changes
+++ b/cross-arm-binutils.changes
@@ -3,6 +3,7 @@ Fri Oct  8 14:11:44 UTC 2021 - Michael Matz <matz@suse.com>
 
 - Configure with --disable-x86-used-note on old code streams.
 - Disable libalternatives temporarily for build cycle reasons.
+- make TARGET-bfd=headers again, we patch bfd-in.h
 - This state submitted to SLE12 and SLE15 code streams for annual
   toolchain update. [jsc#PM-2767, jsc#SLE-21561, jsc#SLE-19618]
 - Bump binutils-2.37-branch.diff to 66d5c7003, to include fixes for
diff --git a/cross-arm-binutils.spec b/cross-arm-binutils.spec
index aff68fb..35f7b50 100644
--- a/cross-arm-binutils.spec
+++ b/cross-arm-binutils.spec
@@ -317,6 +317,12 @@ cd build-dir
 %endif
 	--enable-obsolete
 
+# we patch headers (bfd-in.h) that are input to other headers
+# which are generated only with --enable-maintainer-mode (which we
+# don't do) or explicitely by make headers, so do this:
+make %{?_smp_mflags} all-bfd TARGET-bfd=headers
+# force reconfiguring
+rm bfd/Makefile
 make %{?_smp_mflags}
 
 %else
diff --git a/cross-avr-binutils.changes b/cross-avr-binutils.changes
index bbb89cb..a239ca6 100644
--- a/cross-avr-binutils.changes
+++ b/cross-avr-binutils.changes
@@ -3,6 +3,7 @@ Fri Oct  8 14:11:44 UTC 2021 - Michael Matz <matz@suse.com>
 
 - Configure with --disable-x86-used-note on old code streams.
 - Disable libalternatives temporarily for build cycle reasons.
+- make TARGET-bfd=headers again, we patch bfd-in.h
 - This state submitted to SLE12 and SLE15 code streams for annual
   toolchain update. [jsc#PM-2767, jsc#SLE-21561, jsc#SLE-19618]
 - Bump binutils-2.37-branch.diff to 66d5c7003, to include fixes for
diff --git a/cross-avr-binutils.spec b/cross-avr-binutils.spec
index cf6b6f2..cb683e2 100644
--- a/cross-avr-binutils.spec
+++ b/cross-avr-binutils.spec
@@ -317,6 +317,12 @@ cd build-dir
 %endif
 	--enable-obsolete
 
+# we patch headers (bfd-in.h) that are input to other headers
+# which are generated only with --enable-maintainer-mode (which we
+# don't do) or explicitely by make headers, so do this:
+make %{?_smp_mflags} all-bfd TARGET-bfd=headers
+# force reconfiguring
+rm bfd/Makefile
 make %{?_smp_mflags}
 
 %else
diff --git a/cross-epiphany-binutils.changes b/cross-epiphany-binutils.changes
index bbb89cb..a239ca6 100644
--- a/cross-epiphany-binutils.changes
+++ b/cross-epiphany-binutils.changes
@@ -3,6 +3,7 @@ Fri Oct  8 14:11:44 UTC 2021 - Michael Matz <matz@suse.com>
 
 - Configure with --disable-x86-used-note on old code streams.
 - Disable libalternatives temporarily for build cycle reasons.
+- make TARGET-bfd=headers again, we patch bfd-in.h
 - This state submitted to SLE12 and SLE15 code streams for annual
   toolchain update. [jsc#PM-2767, jsc#SLE-21561, jsc#SLE-19618]
 - Bump binutils-2.37-branch.diff to 66d5c7003, to include fixes for
diff --git a/cross-epiphany-binutils.spec b/cross-epiphany-binutils.spec
index 98cfbd4..1dbb76d 100644
--- a/cross-epiphany-binutils.spec
+++ b/cross-epiphany-binutils.spec
@@ -317,6 +317,12 @@ cd build-dir
 %endif
 	--enable-obsolete
 
+# we patch headers (bfd-in.h) that are input to other headers
+# which are generated only with --enable-maintainer-mode (which we
+# don't do) or explicitely by make headers, so do this:
+make %{?_smp_mflags} all-bfd TARGET-bfd=headers
+# force reconfiguring
+rm bfd/Makefile
 make %{?_smp_mflags}
 
 %else
diff --git a/cross-hppa-binutils.changes b/cross-hppa-binutils.changes
index bbb89cb..a239ca6 100644
--- a/cross-hppa-binutils.changes
+++ b/cross-hppa-binutils.changes
@@ -3,6 +3,7 @@ Fri Oct  8 14:11:44 UTC 2021 - Michael Matz <matz@suse.com>
 
 - Configure with --disable-x86-used-note on old code streams.
 - Disable libalternatives temporarily for build cycle reasons.
+- make TARGET-bfd=headers again, we patch bfd-in.h
 - This state submitted to SLE12 and SLE15 code streams for annual
   toolchain update. [jsc#PM-2767, jsc#SLE-21561, jsc#SLE-19618]
 - Bump binutils-2.37-branch.diff to 66d5c7003, to include fixes for
diff --git a/cross-hppa-binutils.spec b/cross-hppa-binutils.spec
index 5c5683f..4c3aa27 100644
--- a/cross-hppa-binutils.spec
+++ b/cross-hppa-binutils.spec
@@ -317,6 +317,12 @@ cd build-dir
 %endif
 	--enable-obsolete
 
+# we patch headers (bfd-in.h) that are input to other headers
+# which are generated only with --enable-maintainer-mode (which we
+# don't do) or explicitely by make headers, so do this:
+make %{?_smp_mflags} all-bfd TARGET-bfd=headers
+# force reconfiguring
+rm bfd/Makefile
 make %{?_smp_mflags}
 
 %else
diff --git a/cross-hppa64-binutils.changes b/cross-hppa64-binutils.changes
index bbb89cb..a239ca6 100644
--- a/cross-hppa64-binutils.changes
+++ b/cross-hppa64-binutils.changes
@@ -3,6 +3,7 @@ Fri Oct  8 14:11:44 UTC 2021 - Michael Matz <matz@suse.com>
 
 - Configure with --disable-x86-used-note on old code streams.
 - Disable libalternatives temporarily for build cycle reasons.
+- make TARGET-bfd=headers again, we patch bfd-in.h
 - This state submitted to SLE12 and SLE15 code streams for annual
   toolchain update. [jsc#PM-2767, jsc#SLE-21561, jsc#SLE-19618]
 - Bump binutils-2.37-branch.diff to 66d5c7003, to include fixes for
diff --git a/cross-hppa64-binutils.spec b/cross-hppa64-binutils.spec
index 65fcfa2..a7f6f18 100644
--- a/cross-hppa64-binutils.spec
+++ b/cross-hppa64-binutils.spec
@@ -317,6 +317,12 @@ cd build-dir
 %endif
 	--enable-obsolete
 
+# we patch headers (bfd-in.h) that are input to other headers
+# which are generated only with --enable-maintainer-mode (which we
+# don't do) or explicitely by make headers, so do this:
+make %{?_smp_mflags} all-bfd TARGET-bfd=headers
+# force reconfiguring
+rm bfd/Makefile
 make %{?_smp_mflags}
 
 %else
diff --git a/cross-i386-binutils.changes b/cross-i386-binutils.changes
index bbb89cb..a239ca6 100644
--- a/cross-i386-binutils.changes
+++ b/cross-i386-binutils.changes
@@ -3,6 +3,7 @@ Fri Oct  8 14:11:44 UTC 2021 - Michael Matz <matz@suse.com>
 
 - Configure with --disable-x86-used-note on old code streams.
 - Disable libalternatives temporarily for build cycle reasons.
+- make TARGET-bfd=headers again, we patch bfd-in.h
 - This state submitted to SLE12 and SLE15 code streams for annual
   toolchain update. [jsc#PM-2767, jsc#SLE-21561, jsc#SLE-19618]
 - Bump binutils-2.37-branch.diff to 66d5c7003, to include fixes for
diff --git a/cross-i386-binutils.spec b/cross-i386-binutils.spec
index 2c20b59..e3f714e 100644
--- a/cross-i386-binutils.spec
+++ b/cross-i386-binutils.spec
@@ -317,6 +317,12 @@ cd build-dir
 %endif
 	--enable-obsolete
 
+# we patch headers (bfd-in.h) that are input to other headers
+# which are generated only with --enable-maintainer-mode (which we
+# don't do) or explicitely by make headers, so do this:
+make %{?_smp_mflags} all-bfd TARGET-bfd=headers
+# force reconfiguring
+rm bfd/Makefile
 make %{?_smp_mflags}
 
 %else
diff --git a/cross-ia64-binutils.changes b/cross-ia64-binutils.changes
index bbb89cb..a239ca6 100644
--- a/cross-ia64-binutils.changes
+++ b/cross-ia64-binutils.changes
@@ -3,6 +3,7 @@ Fri Oct  8 14:11:44 UTC 2021 - Michael Matz <matz@suse.com>
 
 - Configure with --disable-x86-used-note on old code streams.
 - Disable libalternatives temporarily for build cycle reasons.
+- make TARGET-bfd=headers again, we patch bfd-in.h
 - This state submitted to SLE12 and SLE15 code streams for annual
   toolchain update. [jsc#PM-2767, jsc#SLE-21561, jsc#SLE-19618]
 - Bump binutils-2.37-branch.diff to 66d5c7003, to include fixes for
diff --git a/cross-ia64-binutils.spec b/cross-ia64-binutils.spec
index 15c4946..14f967d 100644
--- a/cross-ia64-binutils.spec
+++ b/cross-ia64-binutils.spec
@@ -317,6 +317,12 @@ cd build-dir
 %endif
 	--enable-obsolete
 
+# we patch headers (bfd-in.h) that are input to other headers
+# which are generated only with --enable-maintainer-mode (which we
+# don't do) or explicitely by make headers, so do this:
+make %{?_smp_mflags} all-bfd TARGET-bfd=headers
+# force reconfiguring
+rm bfd/Makefile
 make %{?_smp_mflags}
 
 %else
diff --git a/cross-m68k-binutils.changes b/cross-m68k-binutils.changes
index bbb89cb..a239ca6 100644
--- a/cross-m68k-binutils.changes
+++ b/cross-m68k-binutils.changes
@@ -3,6 +3,7 @@ Fri Oct  8 14:11:44 UTC 2021 - Michael Matz <matz@suse.com>
 
 - Configure with --disable-x86-used-note on old code streams.
 - Disable libalternatives temporarily for build cycle reasons.
+- make TARGET-bfd=headers again, we patch bfd-in.h
 - This state submitted to SLE12 and SLE15 code streams for annual
   toolchain update. [jsc#PM-2767, jsc#SLE-21561, jsc#SLE-19618]
 - Bump binutils-2.37-branch.diff to 66d5c7003, to include fixes for
diff --git a/cross-m68k-binutils.spec b/cross-m68k-binutils.spec
index 486c2ef..880d5c8 100644
--- a/cross-m68k-binutils.spec
+++ b/cross-m68k-binutils.spec
@@ -317,6 +317,12 @@ cd build-dir
 %endif
 	--enable-obsolete
 
+# we patch headers (bfd-in.h) that are input to other headers
+# which are generated only with --enable-maintainer-mode (which we
+# don't do) or explicitely by make headers, so do this:
+make %{?_smp_mflags} all-bfd TARGET-bfd=headers
+# force reconfiguring
+rm bfd/Makefile
 make %{?_smp_mflags}
 
 %else
diff --git a/cross-mips-binutils.changes b/cross-mips-binutils.changes
index bbb89cb..a239ca6 100644
--- a/cross-mips-binutils.changes
+++ b/cross-mips-binutils.changes
@@ -3,6 +3,7 @@ Fri Oct  8 14:11:44 UTC 2021 - Michael Matz <matz@suse.com>
 
 - Configure with --disable-x86-used-note on old code streams.
 - Disable libalternatives temporarily for build cycle reasons.
+- make TARGET-bfd=headers again, we patch bfd-in.h
 - This state submitted to SLE12 and SLE15 code streams for annual
   toolchain update. [jsc#PM-2767, jsc#SLE-21561, jsc#SLE-19618]
 - Bump binutils-2.37-branch.diff to 66d5c7003, to include fixes for
diff --git a/cross-mips-binutils.spec b/cross-mips-binutils.spec
index 5d667ff..2f90c3f 100644
--- a/cross-mips-binutils.spec
+++ b/cross-mips-binutils.spec
@@ -317,6 +317,12 @@ cd build-dir
 %endif
 	--enable-obsolete
 
+# we patch headers (bfd-in.h) that are input to other headers
+# which are generated only with --enable-maintainer-mode (which we
+# don't do) or explicitely by make headers, so do this:
+make %{?_smp_mflags} all-bfd TARGET-bfd=headers
+# force reconfiguring
+rm bfd/Makefile
 make %{?_smp_mflags}
 
 %else
diff --git a/cross-ppc-binutils.changes b/cross-ppc-binutils.changes
index bbb89cb..a239ca6 100644
--- a/cross-ppc-binutils.changes
+++ b/cross-ppc-binutils.changes
@@ -3,6 +3,7 @@ Fri Oct  8 14:11:44 UTC 2021 - Michael Matz <matz@suse.com>
 
 - Configure with --disable-x86-used-note on old code streams.
 - Disable libalternatives temporarily for build cycle reasons.
+- make TARGET-bfd=headers again, we patch bfd-in.h
 - This state submitted to SLE12 and SLE15 code streams for annual
   toolchain update. [jsc#PM-2767, jsc#SLE-21561, jsc#SLE-19618]
 - Bump binutils-2.37-branch.diff to 66d5c7003, to include fixes for
diff --git a/cross-ppc-binutils.spec b/cross-ppc-binutils.spec
index ce5da24..9a47eae 100644
--- a/cross-ppc-binutils.spec
+++ b/cross-ppc-binutils.spec
@@ -317,6 +317,12 @@ cd build-dir
 %endif
 	--enable-obsolete
 
+# we patch headers (bfd-in.h) that are input to other headers
+# which are generated only with --enable-maintainer-mode (which we
+# don't do) or explicitely by make headers, so do this:
+make %{?_smp_mflags} all-bfd TARGET-bfd=headers
+# force reconfiguring
+rm bfd/Makefile
 make %{?_smp_mflags}
 
 %else
diff --git a/cross-ppc64-binutils.changes b/cross-ppc64-binutils.changes
index bbb89cb..a239ca6 100644
--- a/cross-ppc64-binutils.changes
+++ b/cross-ppc64-binutils.changes
@@ -3,6 +3,7 @@ Fri Oct  8 14:11:44 UTC 2021 - Michael Matz <matz@suse.com>
 
 - Configure with --disable-x86-used-note on old code streams.
 - Disable libalternatives temporarily for build cycle reasons.
+- make TARGET-bfd=headers again, we patch bfd-in.h
 - This state submitted to SLE12 and SLE15 code streams for annual
   toolchain update. [jsc#PM-2767, jsc#SLE-21561, jsc#SLE-19618]
 - Bump binutils-2.37-branch.diff to 66d5c7003, to include fixes for
diff --git a/cross-ppc64-binutils.spec b/cross-ppc64-binutils.spec
index 9836df9..268c268 100644
--- a/cross-ppc64-binutils.spec
+++ b/cross-ppc64-binutils.spec
@@ -317,6 +317,12 @@ cd build-dir
 %endif
 	--enable-obsolete
 
+# we patch headers (bfd-in.h) that are input to other headers
+# which are generated only with --enable-maintainer-mode (which we
+# don't do) or explicitely by make headers, so do this:
+make %{?_smp_mflags} all-bfd TARGET-bfd=headers
+# force reconfiguring
+rm bfd/Makefile
 make %{?_smp_mflags}
 
 %else
diff --git a/cross-ppc64le-binutils.changes b/cross-ppc64le-binutils.changes
index bbb89cb..a239ca6 100644
--- a/cross-ppc64le-binutils.changes
+++ b/cross-ppc64le-binutils.changes
@@ -3,6 +3,7 @@ Fri Oct  8 14:11:44 UTC 2021 - Michael Matz <matz@suse.com>
 
 - Configure with --disable-x86-used-note on old code streams.
 - Disable libalternatives temporarily for build cycle reasons.
+- make TARGET-bfd=headers again, we patch bfd-in.h
 - This state submitted to SLE12 and SLE15 code streams for annual
   toolchain update. [jsc#PM-2767, jsc#SLE-21561, jsc#SLE-19618]
 - Bump binutils-2.37-branch.diff to 66d5c7003, to include fixes for
diff --git a/cross-ppc64le-binutils.spec b/cross-ppc64le-binutils.spec
index 94b85cf..48880cf 100644
--- a/cross-ppc64le-binutils.spec
+++ b/cross-ppc64le-binutils.spec
@@ -317,6 +317,12 @@ cd build-dir
 %endif
 	--enable-obsolete
 
+# we patch headers (bfd-in.h) that are input to other headers
+# which are generated only with --enable-maintainer-mode (which we
+# don't do) or explicitely by make headers, so do this:
+make %{?_smp_mflags} all-bfd TARGET-bfd=headers
+# force reconfiguring
+rm bfd/Makefile
 make %{?_smp_mflags}
 
 %else
diff --git a/cross-riscv64-binutils.changes b/cross-riscv64-binutils.changes
index bbb89cb..a239ca6 100644
--- a/cross-riscv64-binutils.changes
+++ b/cross-riscv64-binutils.changes
@@ -3,6 +3,7 @@ Fri Oct  8 14:11:44 UTC 2021 - Michael Matz <matz@suse.com>
 
 - Configure with --disable-x86-used-note on old code streams.
 - Disable libalternatives temporarily for build cycle reasons.
+- make TARGET-bfd=headers again, we patch bfd-in.h
 - This state submitted to SLE12 and SLE15 code streams for annual
   toolchain update. [jsc#PM-2767, jsc#SLE-21561, jsc#SLE-19618]
 - Bump binutils-2.37-branch.diff to 66d5c7003, to include fixes for
diff --git a/cross-riscv64-binutils.spec b/cross-riscv64-binutils.spec
index 08bf15e..2bdfa50 100644
--- a/cross-riscv64-binutils.spec
+++ b/cross-riscv64-binutils.spec
@@ -317,6 +317,12 @@ cd build-dir
 %endif
 	--enable-obsolete
 
+# we patch headers (bfd-in.h) that are input to other headers
+# which are generated only with --enable-maintainer-mode (which we
+# don't do) or explicitely by make headers, so do this:
+make %{?_smp_mflags} all-bfd TARGET-bfd=headers
+# force reconfiguring
+rm bfd/Makefile
 make %{?_smp_mflags}
 
 %else
diff --git a/cross-rx-binutils.changes b/cross-rx-binutils.changes
index bbb89cb..a239ca6 100644
--- a/cross-rx-binutils.changes
+++ b/cross-rx-binutils.changes
@@ -3,6 +3,7 @@ Fri Oct  8 14:11:44 UTC 2021 - Michael Matz <matz@suse.com>
 
 - Configure with --disable-x86-used-note on old code streams.
 - Disable libalternatives temporarily for build cycle reasons.
+- make TARGET-bfd=headers again, we patch bfd-in.h
 - This state submitted to SLE12 and SLE15 code streams for annual
   toolchain update. [jsc#PM-2767, jsc#SLE-21561, jsc#SLE-19618]
 - Bump binutils-2.37-branch.diff to 66d5c7003, to include fixes for
diff --git a/cross-rx-binutils.spec b/cross-rx-binutils.spec
index 517c605..9970131 100644
--- a/cross-rx-binutils.spec
+++ b/cross-rx-binutils.spec
@@ -317,6 +317,12 @@ cd build-dir
 %endif
 	--enable-obsolete
 
+# we patch headers (bfd-in.h) that are input to other headers
+# which are generated only with --enable-maintainer-mode (which we
+# don't do) or explicitely by make headers, so do this:
+make %{?_smp_mflags} all-bfd TARGET-bfd=headers
+# force reconfiguring
+rm bfd/Makefile
 make %{?_smp_mflags}
 
 %else
diff --git a/cross-s390-binutils.changes b/cross-s390-binutils.changes
index bbb89cb..a239ca6 100644
--- a/cross-s390-binutils.changes
+++ b/cross-s390-binutils.changes
@@ -3,6 +3,7 @@ Fri Oct  8 14:11:44 UTC 2021 - Michael Matz <matz@suse.com>
 
 - Configure with --disable-x86-used-note on old code streams.
 - Disable libalternatives temporarily for build cycle reasons.
+- make TARGET-bfd=headers again, we patch bfd-in.h
 - This state submitted to SLE12 and SLE15 code streams for annual
   toolchain update. [jsc#PM-2767, jsc#SLE-21561, jsc#SLE-19618]
 - Bump binutils-2.37-branch.diff to 66d5c7003, to include fixes for
diff --git a/cross-s390-binutils.spec b/cross-s390-binutils.spec
index fcce508..8ca225b 100644
--- a/cross-s390-binutils.spec
+++ b/cross-s390-binutils.spec
@@ -317,6 +317,12 @@ cd build-dir
 %endif
 	--enable-obsolete
 
+# we patch headers (bfd-in.h) that are input to other headers
+# which are generated only with --enable-maintainer-mode (which we
+# don't do) or explicitely by make headers, so do this:
+make %{?_smp_mflags} all-bfd TARGET-bfd=headers
+# force reconfiguring
+rm bfd/Makefile
 make %{?_smp_mflags}
 
 %else
diff --git a/cross-s390x-binutils.changes b/cross-s390x-binutils.changes
index bbb89cb..a239ca6 100644
--- a/cross-s390x-binutils.changes
+++ b/cross-s390x-binutils.changes
@@ -3,6 +3,7 @@ Fri Oct  8 14:11:44 UTC 2021 - Michael Matz <matz@suse.com>
 
 - Configure with --disable-x86-used-note on old code streams.
 - Disable libalternatives temporarily for build cycle reasons.
+- make TARGET-bfd=headers again, we patch bfd-in.h
 - This state submitted to SLE12 and SLE15 code streams for annual
   toolchain update. [jsc#PM-2767, jsc#SLE-21561, jsc#SLE-19618]
 - Bump binutils-2.37-branch.diff to 66d5c7003, to include fixes for
diff --git a/cross-s390x-binutils.spec b/cross-s390x-binutils.spec
index a93c900..08ac550 100644
--- a/cross-s390x-binutils.spec
+++ b/cross-s390x-binutils.spec
@@ -317,6 +317,12 @@ cd build-dir
 %endif
 	--enable-obsolete
 
+# we patch headers (bfd-in.h) that are input to other headers
+# which are generated only with --enable-maintainer-mode (which we
+# don't do) or explicitely by make headers, so do this:
+make %{?_smp_mflags} all-bfd TARGET-bfd=headers
+# force reconfiguring
+rm bfd/Makefile
 make %{?_smp_mflags}
 
 %else
diff --git a/cross-sparc-binutils.changes b/cross-sparc-binutils.changes
index bbb89cb..a239ca6 100644
--- a/cross-sparc-binutils.changes
+++ b/cross-sparc-binutils.changes
@@ -3,6 +3,7 @@ Fri Oct  8 14:11:44 UTC 2021 - Michael Matz <matz@suse.com>
 
 - Configure with --disable-x86-used-note on old code streams.
 - Disable libalternatives temporarily for build cycle reasons.
+- make TARGET-bfd=headers again, we patch bfd-in.h
 - This state submitted to SLE12 and SLE15 code streams for annual
   toolchain update. [jsc#PM-2767, jsc#SLE-21561, jsc#SLE-19618]
 - Bump binutils-2.37-branch.diff to 66d5c7003, to include fixes for
diff --git a/cross-sparc-binutils.spec b/cross-sparc-binutils.spec
index 2bc8acd..c2c8bc5 100644
--- a/cross-sparc-binutils.spec
+++ b/cross-sparc-binutils.spec
@@ -317,6 +317,12 @@ cd build-dir
 %endif
 	--enable-obsolete
 
+# we patch headers (bfd-in.h) that are input to other headers
+# which are generated only with --enable-maintainer-mode (which we
+# don't do) or explicitely by make headers, so do this:
+make %{?_smp_mflags} all-bfd TARGET-bfd=headers
+# force reconfiguring
+rm bfd/Makefile
 make %{?_smp_mflags}
 
 %else
diff --git a/cross-sparc64-binutils.changes b/cross-sparc64-binutils.changes
index bbb89cb..a239ca6 100644
--- a/cross-sparc64-binutils.changes
+++ b/cross-sparc64-binutils.changes
@@ -3,6 +3,7 @@ Fri Oct  8 14:11:44 UTC 2021 - Michael Matz <matz@suse.com>
 
 - Configure with --disable-x86-used-note on old code streams.
 - Disable libalternatives temporarily for build cycle reasons.
+- make TARGET-bfd=headers again, we patch bfd-in.h
 - This state submitted to SLE12 and SLE15 code streams for annual
   toolchain update. [jsc#PM-2767, jsc#SLE-21561, jsc#SLE-19618]
 - Bump binutils-2.37-branch.diff to 66d5c7003, to include fixes for
diff --git a/cross-sparc64-binutils.spec b/cross-sparc64-binutils.spec
index 03558b7..c2dd853 100644
--- a/cross-sparc64-binutils.spec
+++ b/cross-sparc64-binutils.spec
@@ -317,6 +317,12 @@ cd build-dir
 %endif
 	--enable-obsolete
 
+# we patch headers (bfd-in.h) that are input to other headers
+# which are generated only with --enable-maintainer-mode (which we
+# don't do) or explicitely by make headers, so do this:
+make %{?_smp_mflags} all-bfd TARGET-bfd=headers
+# force reconfiguring
+rm bfd/Makefile
 make %{?_smp_mflags}
 
 %else
diff --git a/cross-spu-binutils.changes b/cross-spu-binutils.changes
index bbb89cb..a239ca6 100644
--- a/cross-spu-binutils.changes
+++ b/cross-spu-binutils.changes
@@ -3,6 +3,7 @@ Fri Oct  8 14:11:44 UTC 2021 - Michael Matz <matz@suse.com>
 
 - Configure with --disable-x86-used-note on old code streams.
 - Disable libalternatives temporarily for build cycle reasons.
+- make TARGET-bfd=headers again, we patch bfd-in.h
 - This state submitted to SLE12 and SLE15 code streams for annual
   toolchain update. [jsc#PM-2767, jsc#SLE-21561, jsc#SLE-19618]
 - Bump binutils-2.37-branch.diff to 66d5c7003, to include fixes for
diff --git a/cross-spu-binutils.spec b/cross-spu-binutils.spec
index 8cb2b8d..8997622 100644
--- a/cross-spu-binutils.spec
+++ b/cross-spu-binutils.spec
@@ -317,6 +317,12 @@ cd build-dir
 %endif
 	--enable-obsolete
 
+# we patch headers (bfd-in.h) that are input to other headers
+# which are generated only with --enable-maintainer-mode (which we
+# don't do) or explicitely by make headers, so do this:
+make %{?_smp_mflags} all-bfd TARGET-bfd=headers
+# force reconfiguring
+rm bfd/Makefile
 make %{?_smp_mflags}
 
 %else
diff --git a/cross-x86_64-binutils.changes b/cross-x86_64-binutils.changes
index bbb89cb..a239ca6 100644
--- a/cross-x86_64-binutils.changes
+++ b/cross-x86_64-binutils.changes
@@ -3,6 +3,7 @@ Fri Oct  8 14:11:44 UTC 2021 - Michael Matz <matz@suse.com>
 
 - Configure with --disable-x86-used-note on old code streams.
 - Disable libalternatives temporarily for build cycle reasons.
+- make TARGET-bfd=headers again, we patch bfd-in.h
 - This state submitted to SLE12 and SLE15 code streams for annual
   toolchain update. [jsc#PM-2767, jsc#SLE-21561, jsc#SLE-19618]
 - Bump binutils-2.37-branch.diff to 66d5c7003, to include fixes for
diff --git a/cross-x86_64-binutils.spec b/cross-x86_64-binutils.spec
index 3a19d44..9d568cf 100644
--- a/cross-x86_64-binutils.spec
+++ b/cross-x86_64-binutils.spec
@@ -317,6 +317,12 @@ cd build-dir
 %endif
 	--enable-obsolete
 
+# we patch headers (bfd-in.h) that are input to other headers
+# which are generated only with --enable-maintainer-mode (which we
+# don't do) or explicitely by make headers, so do this:
+make %{?_smp_mflags} all-bfd TARGET-bfd=headers
+# force reconfiguring
+rm bfd/Makefile
 make %{?_smp_mflags}
 
 %else
diff --git a/cross-xtensa-binutils.changes b/cross-xtensa-binutils.changes
index bbb89cb..a239ca6 100644
--- a/cross-xtensa-binutils.changes
+++ b/cross-xtensa-binutils.changes
@@ -3,6 +3,7 @@ Fri Oct  8 14:11:44 UTC 2021 - Michael Matz <matz@suse.com>
 
 - Configure with --disable-x86-used-note on old code streams.
 - Disable libalternatives temporarily for build cycle reasons.
+- make TARGET-bfd=headers again, we patch bfd-in.h
 - This state submitted to SLE12 and SLE15 code streams for annual
   toolchain update. [jsc#PM-2767, jsc#SLE-21561, jsc#SLE-19618]
 - Bump binutils-2.37-branch.diff to 66d5c7003, to include fixes for
diff --git a/cross-xtensa-binutils.spec b/cross-xtensa-binutils.spec
index a4e0b26..1f11486 100644
--- a/cross-xtensa-binutils.spec
+++ b/cross-xtensa-binutils.spec
@@ -317,6 +317,12 @@ cd build-dir
 %endif
 	--enable-obsolete
 
+# we patch headers (bfd-in.h) that are input to other headers
+# which are generated only with --enable-maintainer-mode (which we
+# don't do) or explicitely by make headers, so do this:
+make %{?_smp_mflags} all-bfd TARGET-bfd=headers
+# force reconfiguring
+rm bfd/Makefile
 make %{?_smp_mflags}
 
 %else