diff --git a/src/bfd/aoutx.h b/src/bfd/aoutx.h
index a8476a1d3..400727ee4 100644
--- a/src/bfd/aoutx.h
+++ b/src/bfd/aoutx.h
@@ -118,8 +118,8 @@ DESCRIPTION
 
 #define KEEPIT udata.i
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "safe-ctype.h"
 #include "bfdlink.h"
 
diff --git a/src/bfd/archive64.c b/src/bfd/archive64.c
index 8b58cb646..1d66b3a51 100644
--- a/src/bfd/archive64.c
+++ b/src/bfd/archive64.c
@@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin St., 5th Floor, Boston, MA 02110-1301, USA */
 
 /* This file supports the 64-bit (MIPS) ELF archives.  */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libbfd.h"
 #include "aout/ar.h"
 
diff --git a/src/bfd/archures.c b/src/bfd/archures.c
index 7a5b489f1..e9f4b8f26 100644
--- a/src/bfd/archures.c
+++ b/src/bfd/archures.c
@@ -20,8 +20,8 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St., 5th Floor, Boston, MA 02110-1301, USA */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libbfd.h"
 #include "safe-ctype.h"
 
diff --git a/src/bfd/bfd.c b/src/bfd/bfd.c
index 51a423ac3..3d3b8351b 100644
--- a/src/bfd/bfd.c
+++ b/src/bfd/bfd.c
@@ -204,9 +204,9 @@ CODE_FRAGMENT
 .
 */
 
+#include "sysdep.h"
 #include "bfd.h"
 #include "bfdver.h"
-#include "sysdep.h"
 #include <stdarg.h>
 #include "libiberty.h"
 #include "safe-ctype.h"
diff --git a/src/bfd/binary.c b/src/bfd/binary.c
index a7d80fa6d..8b741afe8 100644
--- a/src/bfd/binary.c
+++ b/src/bfd/binary.c
@@ -1,4 +1,4 @@
-/* BFD back-end for binary objects.
+/* binary.c: BFD back-end for binary objects.
    Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
    2004, 2005 Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Support, <ian@cygnus.com>
@@ -17,7 +17,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+   Foundation, Inc., 51 Franklin St., 5th Floor, Boston, MA 02110-1301, USA */
 
 /* This is a BFD backend which may be used to write binary objects.
    It may only be used for output, not input.  The intention is that
@@ -32,8 +32,8 @@
    the file.  objcopy cooperates by specially setting the start
    address to zero by default.  */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "safe-ctype.h"
 #include "libbfd.h"
 
diff --git a/src/bfd/cache.c b/src/bfd/cache.c
index e88eda4b0..282c8940f 100644
--- a/src/bfd/cache.c
+++ b/src/bfd/cache.c
@@ -38,8 +38,8 @@ SECTION
 
 */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libbfd.h"
 #include "libiberty.h"
 
diff --git a/src/bfd/coffgen.c b/src/bfd/coffgen.c
index 343230d5e..5c5a94c8b 100644
--- a/src/bfd/coffgen.c
+++ b/src/bfd/coffgen.c
@@ -37,8 +37,8 @@
    Those functions may not use any COFF specific information, such as
    coff_data (abfd).  */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libbfd.h"
 #include "coff/internal.h"
 #include "libcoff.h"
diff --git a/src/bfd/cofflink.c b/src/bfd/cofflink.c
index 81d8af7a2..270c0d579 100644
--- a/src/bfd/cofflink.c
+++ b/src/bfd/cofflink.c
@@ -21,8 +21,8 @@
 
 /* This file contains the COFF backend linker code.  */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "bfdlink.h"
 #include "libbfd.h"
 #include "coff/internal.h"
diff --git a/src/bfd/corefile.c b/src/bfd/corefile.c
index 212637aa4..e9b098114 100644
--- a/src/bfd/corefile.c
+++ b/src/bfd/corefile.c
@@ -27,8 +27,8 @@ DESCRIPTION
 	These are functions pertaining to core files.
 */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libbfd.h"
 
 /*
diff --git a/src/bfd/dwarf1.c b/src/bfd/dwarf1.c
index d04f2b275..78c0ce4ff 100644
--- a/src/bfd/dwarf1.c
+++ b/src/bfd/dwarf1.c
@@ -1,8 +1,8 @@
-/* DWARF 1 find nearest line (_bfd_dwarf1_find_nearest_line).
+/* dwarf1.c: DWARF 1 find nearest line (_bfd_dwarf1_find_nearest_line).
    Copyright 1998, 1999, 2000, 2001, 2002, 2004, 2005
    Free Software Foundation, Inc.
 
-   Written by Gavin Romig-Koch of Cygnus Solutions (gavin@cygnus.com).
+   Written by Gavin Romig-Koch of Cygnus Solutions <gavin@cygnus.com>.
 
    This file is part of BFD.
 
@@ -18,10 +18,10 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+   Foundation, Inc., 51 Franklin St., 5th Floor, Boston, MA 02110-1301, USA */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libiberty.h"
 #include "libbfd.h"
 #include "elf-bfd.h"
diff --git a/src/bfd/dwarf2.c b/src/bfd/dwarf2.c
index 4a25acd55..66fbc1abd 100644
--- a/src/bfd/dwarf2.c
+++ b/src/bfd/dwarf2.c
@@ -29,8 +29,8 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St., 5th Floor, Boston, MA 02110-1301, USA */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libiberty.h"
 #include "libbfd.h"
 #include "elf-bfd.h"
diff --git a/src/bfd/efi-app-ia32.c b/src/bfd/efi-app-ia32.c
index 1b5f0e60a..d76d56d36 100644
--- a/src/bfd/efi-app-ia32.c
+++ b/src/bfd/efi-app-ia32.c
@@ -19,8 +19,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street - 5th Floor, Boston, MA 02110-1301, USA. */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 
 #define TARGET_SYM bfd_efi_app_ia32_vec
 #define TARGET_NAME "efi-app-ia32"
diff --git a/src/bfd/efi-app-ia64.c b/src/bfd/efi-app-ia64.c
index b966980f5..52a0a579b 100644
--- a/src/bfd/efi-app-ia64.c
+++ b/src/bfd/efi-app-ia64.c
@@ -16,10 +16,10 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+Foundation, Inc., 51 Franklin St., 5th Floor, Boston, MA 02110-1301, USA.  */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 
 #define TARGET_SYM bfd_efi_app_ia64_vec
 #define TARGET_NAME "efi-app-ia64"
diff --git a/src/bfd/elf-eh-frame.c b/src/bfd/elf-eh-frame.c
index e1fb5a16c..520171ccd 100644
--- a/src/bfd/elf-eh-frame.c
+++ b/src/bfd/elf-eh-frame.c
@@ -18,8 +18,8 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St., 5th Floor, Boston, MA 02110-1301, USA */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libbfd.h"
 #include "elf-bfd.h"
 #include "elf/dwarf2.h"
diff --git a/src/bfd/elf-strtab.c b/src/bfd/elf-strtab.c
index b32149fc0..104cc2a83 100644
--- a/src/bfd/elf-strtab.c
+++ b/src/bfd/elf-strtab.c
@@ -18,8 +18,8 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St., 5th Floor, Boston, MA 02110-1301, USA */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libbfd.h"
 #include "elf-bfd.h"
 #include "hashtab.h"
diff --git a/src/bfd/elf-vxworks.c b/src/bfd/elf-vxworks.c
index a6bb87a32..e13488ac1 100644
--- a/src/bfd/elf-vxworks.c
+++ b/src/bfd/elf-vxworks.c
@@ -20,8 +20,8 @@
 
 /* This file provides routines used by all VxWorks targets.  */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libbfd.h"
 #include "elf-bfd.h"
 #include "elf-vxworks.h"
diff --git a/src/bfd/elf.c b/src/bfd/elf.c
index cb6ca5810..6bb126a94 100644
--- a/src/bfd/elf.c
+++ b/src/bfd/elf.c
@@ -18,7 +18,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - 5th Floor, Boston, MA 02110-1301, USA. */
+   Foundation, Inc., 51 Franklin St., 5th Floor, Boston, MA 02110-1301, USA. */
 
 /*
 SECTION
@@ -36,8 +36,8 @@ SECTION
 #ifndef _SYSCALL32
 # define _SYSCALL32
 #endif /* !_SYSCALL32 */
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "bfdlink.h"
 #include "libbfd.h"
 #define ARCH_SIZE 0
diff --git a/src/bfd/elf32-gen.c b/src/bfd/elf32-gen.c
index 23c747677..494ed479c 100644
--- a/src/bfd/elf32-gen.c
+++ b/src/bfd/elf32-gen.c
@@ -1,4 +1,4 @@
-/* Generic support for 32-bit ELF
+/* elf32-gen.c: Generic support for 32-bit ELF
    Copyright 1993, 1995, 1998, 1999, 2001, 2002, 2004, 2005
    Free Software Foundation, Inc.
 
@@ -16,10 +16,10 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+   Foundation, Inc., 51 Franklin St., 5th Floor, Boston, MA 02110-1301, USA */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libbfd.h"
 #include "elf-bfd.h"
 
diff --git a/src/bfd/elf32-i386.c b/src/bfd/elf32-i386.c
index 871c142d6..f133b6824 100644
--- a/src/bfd/elf32-i386.c
+++ b/src/bfd/elf32-i386.c
@@ -1,4 +1,4 @@
-/* Intel 80386/80486-specific support for 32-bit ELF
+/* elf32-i386.c: Intel 80386/80486-specific support for 32-bit ELF
    Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
    2003, 2004, 2005 Free Software Foundation, Inc.
 
@@ -16,10 +16,10 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+   Foundation, Inc., 51 Franklin St., 5th Floor, Boston, MA 02110-1301, USA */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "bfdlink.h"
 #include "libbfd.h"
 #include "elf-bfd.h"
diff --git a/src/bfd/elf64-gen.c b/src/bfd/elf64-gen.c
index 9ed0f2243..8d5670274 100644
--- a/src/bfd/elf64-gen.c
+++ b/src/bfd/elf64-gen.c
@@ -18,8 +18,8 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St., 5th Floor, Boston, MA 02110-1301, USA */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libbfd.h"
 #include "elf-bfd.h"
 
diff --git a/src/bfd/elf64-x86-64.c b/src/bfd/elf64-x86-64.c
index f41660efe..a0b833c6c 100644
--- a/src/bfd/elf64-x86-64.c
+++ b/src/bfd/elf64-x86-64.c
@@ -1,4 +1,4 @@
-/* X86-64 specific support for 64-bit ELF
+/* elf64-x86-64.c: X86-64 specific support for 64-bit ELF
    Copyright 2000, 2001, 2002, 2003, 2004, 2005
    Free Software Foundation, Inc.
    Contributed by Jan Hubicka <jh@suse.cz>.
@@ -17,22 +17,22 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+   Foundation, Inc., 51 Franklin St., 5th Floor, Boston, MA 02110-1301, USA */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "bfdlink.h"
 #include "libbfd.h"
 #include "elf-bfd.h"
 
 #include "elf/x86-64.h"
 
-/* In case we're on a 32-bit machine, construct a 64-bit "-1" value.  */
-#define MINUS_ONE (~ (bfd_vma) 0)
+/* In case we are on a 32-bit machine, construct a 64-bit "-1" value: */
+#define MINUS_ONE (~(bfd_vma)0)
 
 /* The relocation "howto" table.  Order of fields:
    type, size, bitsize, pc_relative, complain_on_overflow,
-   special_function, name, partial_inplace, src_mask, dst_pack, pcrel_offset.  */
+   special_function, name, partial_inplace, src_mask, dst_pack, pcrel_offset */
 static reloc_howto_type x86_64_elf_howto_table[] =
 {
   HOWTO(R_X86_64_NONE, 0, 0, 0, FALSE, 0, complain_overflow_dont,
diff --git a/src/bfd/elfcode.h b/src/bfd/elfcode.h
index b8faf960d..d88018bf6 100644
--- a/src/bfd/elfcode.h
+++ b/src/bfd/elfcode.h
@@ -67,8 +67,8 @@ Foundation, Inc., 51 Franklin St., 5th Floor, Boston, MA 02110-1301, USA */
 #ifndef ELFCODE_H
 #define ELFCODE_H 1
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libiberty.h"
 #include "bfdlink.h"
 #include "libbfd.h"
diff --git a/src/bfd/elflink.c b/src/bfd/elflink.c
index 04a7e5b92..27fe162e1 100644
--- a/src/bfd/elflink.c
+++ b/src/bfd/elflink.c
@@ -18,8 +18,8 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St., 5th Floor, Boston, MA 02110-1301, USA */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "bfdlink.h"
 #include "libbfd.h"
 #define ARCH_SIZE 0
diff --git a/src/bfd/format.c b/src/bfd/format.c
index 94575cba8..64e677cdf 100644
--- a/src/bfd/format.c
+++ b/src/bfd/format.c
@@ -42,8 +42,8 @@ SECTION
 
 */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libbfd.h"
 
 /* IMPORT from targets.c.  */
diff --git a/src/bfd/hash.c b/src/bfd/hash.c
index 389950d11..b986211b6 100644
--- a/src/bfd/hash.c
+++ b/src/bfd/hash.c
@@ -17,10 +17,10 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+   Foundation, Inc., 51 Franklin St., 5th Floor, Boston, MA 02110-1301, USA */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libbfd.h"
 #include "objalloc.h"
 #include "libiberty.h"
diff --git a/src/bfd/i386linux.c b/src/bfd/i386linux.c
index b62e2016a..7d35f9de7 100644
--- a/src/bfd/i386linux.c
+++ b/src/bfd/i386linux.c
@@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 
 #define MACHTYPE_OK(mtype) ((mtype) == M_386 || (mtype) == M_UNKNOWN)
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libbfd.h"
 #include "aout/aout64.h"
 #include "aout/stab_gnu.h"
diff --git a/src/bfd/ihex.c b/src/bfd/ihex.c
index 56b46000d..11a6988de 100644
--- a/src/bfd/ihex.c
+++ b/src/bfd/ihex.c
@@ -118,8 +118,8 @@ The MRI compiler uses this, which is a repeat of type 5:
    18..19	Checksum in hex notation
    20..21	Carriage return, line feed.  */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libbfd.h"
 #include "libiberty.h"
 #include "safe-ctype.h"
diff --git a/src/bfd/init.c b/src/bfd/init.c
index b6e4446b5..7194b62a8 100644
--- a/src/bfd/init.c
+++ b/src/bfd/init.c
@@ -20,8 +20,8 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St., 5th Floor, Boston, MA 02110-1301, USA.
  */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libbfd.h"
 
 /*
diff --git a/src/bfd/libbfd.c b/src/bfd/libbfd.c
index df4ad5373..faa8d905e 100644
--- a/src/bfd/libbfd.c
+++ b/src/bfd/libbfd.c
@@ -20,8 +20,8 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St., 5th Floor, Boston, MA 02110-1301, USA */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libbfd.h"
 
 #include "libiberty.h"
diff --git a/src/bfd/linker.c b/src/bfd/linker.c
index 3224bbc14..f1a520d0d 100644
--- a/src/bfd/linker.c
+++ b/src/bfd/linker.c
@@ -17,10 +17,10 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+   Foundation, Inc., 51 Franklin St., 5th Floor, Boston, MA 02110-1301, USA */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libbfd.h"
 #include "bfdlink.h"
 #include "genlink.h"
diff --git a/src/bfd/merge.c b/src/bfd/merge.c
index f1cfca4c4..21bc92436 100644
--- a/src/bfd/merge.c
+++ b/src/bfd/merge.c
@@ -1,4 +1,4 @@
-/* SEC_MERGE support.
+/* merge.c: SEC_MERGE support.
    Copyright 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
    Written by Jakub Jelinek <jakub@redhat.com>.
 
@@ -16,13 +16,13 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+   Foundation, Inc., 51 Franklin St., 5th Floor, Boston, MA 02110-1301, USA */
 
 /* This file contains support for merging duplicate entities within sections,
    as used in ELF SHF_MERGE.  */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libbfd.h"
 #include "hashtab.h"
 #include "libiberty.h"
diff --git a/src/bfd/opncls.c b/src/bfd/opncls.c
index 8b9d84bca..56c3234bc 100644
--- a/src/bfd/opncls.c
+++ b/src/bfd/opncls.c
@@ -21,8 +21,8 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St., 5th Floor, Boston, MA 02110-1301, USA */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "objalloc.h"
 #include "libbfd.h"
 #include "libiberty.h"
diff --git a/src/bfd/peXXigen.c b/src/bfd/peXXigen.c
index cc1f96ad5..cb8927c15 100644
--- a/src/bfd/peXXigen.c
+++ b/src/bfd/peXXigen.c
@@ -63,8 +63,8 @@
 # define COFF_WITH_XX
 #endif /* !COFF_WITH_XX */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libbfd.h"
 #include "coff/internal.h"
 
diff --git a/src/bfd/po/bfd.pot b/src/bfd/po/bfd.pot
index a9a02db2a..3331f548e 100644
--- a/src/bfd/po/bfd.pot
+++ b/src/bfd/po/bfd.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-19 16:40-0400\n"
+"POT-Creation-Date: 2024-10-19 18:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/bfd/reloc.c b/src/bfd/reloc.c
index bdfd9faf9..0a7bd0a93 100644
--- a/src/bfd/reloc.c
+++ b/src/bfd/reloc.c
@@ -47,8 +47,8 @@ SECTION
 /* DO compile in the reloc_code name table from libbfd.h.  */
 #define _BFD_MAKE_TABLE_bfd_reloc_code_real
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "bfdlink.h"
 #include "libbfd.h"
 /*
diff --git a/src/bfd/section.c b/src/bfd/section.c
index eb590393e..a061d5d24 100644
--- a/src/bfd/section.c
+++ b/src/bfd/section.c
@@ -134,8 +134,8 @@ SUBSECTION
 
 */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libbfd.h"
 #include "bfdlink.h"
 
diff --git a/src/bfd/srec.c b/src/bfd/srec.c
index 2413878c6..549a1fe0e 100644
--- a/src/bfd/srec.c
+++ b/src/bfd/srec.c
@@ -101,8 +101,8 @@
 	We allow symbols to be anywhere in the data stream - the module names
 	are always ignored.  */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libbfd.h"
 #include "libiberty.h"
 #include "safe-ctype.h"
diff --git a/src/bfd/stabs.c b/src/bfd/stabs.c
index 3ee288bb5..0e1234e53 100644
--- a/src/bfd/stabs.c
+++ b/src/bfd/stabs.c
@@ -1,4 +1,4 @@
-/* Stabs in sections linking support.
+/* stabs.c: Stabs in sections linking support.
    Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
    Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Support.
@@ -17,13 +17,13 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+   Foundation, Inc., 51 Franklin St., 5th Floor, Boston, MA 02110-1301, USA */
 
 /* This file contains support for linking stabs in sections, as used
    on COFF and ELF.  */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libbfd.h"
 #include "aout/stab_gnu.h"
 #include "safe-ctype.h"
diff --git a/src/bfd/syms.c b/src/bfd/syms.c
index 0d8f39c53..df22e6ff5 100644
--- a/src/bfd/syms.c
+++ b/src/bfd/syms.c
@@ -18,7 +18,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+   Foundation, Inc., 51 Franklin St., 5th Floor, Boston, MA 02110-1301, USA */
 
 /*
 SECTION
@@ -307,8 +307,8 @@ CODE_FRAGMENT
 .
 */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libbfd.h"
 #include "safe-ctype.h"
 #include "bfdlink.h"
diff --git a/src/bfd/targets.c b/src/bfd/targets.c
index 4734f7420..d6d337098 100644
--- a/src/bfd/targets.c
+++ b/src/bfd/targets.c
@@ -18,10 +18,10 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+   Foundation, Inc., 51 Franklin St., 5th Floor, Boston, MA 02110-1301, USA */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libbfd.h"
 #include "fnmatch.h"
 
diff --git a/src/bfd/tekhex.c b/src/bfd/tekhex.c
index 7695f6874..86691547f 100644
--- a/src/bfd/tekhex.c
+++ b/src/bfd/tekhex.c
@@ -63,10 +63,10 @@
 	8) termination record
 
   The data can come out of order, and may be discontigous. This is a
-  serial protocol, so big files are unlikely, so we keep a list of 8k chunks.  */
+  serial protocol, so big files are unlikely, so we keep a list of 8k chunks. */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libbfd.h"
 #include "libiberty.h"
 
diff --git a/src/opcodes/ns32k-dis.c b/src/opcodes/ns32k-dis.c
index e3ec5d256..72978e1ff 100644
--- a/src/opcodes/ns32k-dis.c
+++ b/src/opcodes/ns32k-dis.c
@@ -19,7 +19,7 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 
-
+#include "config.h"
 #include "bfd.h"
 #include "sysdep.h"
 #include "dis-asm.h"
@@ -48,7 +48,7 @@ read_memory_integer (unsigned char * addr, int nr)
   return val;
 }
 
-/* 32000 instructions are never longer than this.  */
+/* 32000 instructions are never longer than this: */
 #define MAXLEN 62
 
 #include <setjmp.h>
diff --git a/src/opcodes/po/opcodes.pot b/src/opcodes/po/opcodes.pot
index f4a47e865..086c33049 100644
--- a/src/opcodes/po/opcodes.pot
+++ b/src/opcodes/po/opcodes.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-24 23:57-0400\n"
+"POT-Creation-Date: 2024-10-19 18:14-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"