Revert the header-sorting patch

Andreas Schwab and John Baldwin pointed out some bugs in the header
sorting patch; and I noticed that the output was not correct when
limited to a subset of files (a bug in my script).

So, I'm reverting the patch.  I may try again after fixing the issues
pointed out.

gdb/ChangeLog
2019-04-05  Tom Tromey  <tom@tromey.com>

	Revert the header-sorting patch.
	* ft32-tdep.c: Revert.
	* frv-tdep.c: Revert.
	* frv-linux-tdep.c: Revert.
	* frame.c: Revert.
	* frame-unwind.c: Revert.
	* frame-base.c: Revert.
	* fork-child.c: Revert.
	* findvar.c: Revert.
	* findcmd.c: Revert.
	* filesystem.c: Revert.
	* filename-seen-cache.h: Revert.
	* filename-seen-cache.c: Revert.
	* fbsd-tdep.c: Revert.
	* fbsd-nat.h: Revert.
	* fbsd-nat.c: Revert.
	* f-valprint.c: Revert.
	* f-typeprint.c: Revert.
	* f-lang.c: Revert.
	* extension.h: Revert.
	* extension.c: Revert.
	* extension-priv.h: Revert.
	* expprint.c: Revert.
	* exec.h: Revert.
	* exec.c: Revert.
	* exceptions.c: Revert.
	* event-top.c: Revert.
	* event-loop.c: Revert.
	* eval.c: Revert.
	* elfread.c: Revert.
	* dwarf2read.h: Revert.
	* dwarf2read.c: Revert.
	* dwarf2loc.c: Revert.
	* dwarf2expr.h: Revert.
	* dwarf2expr.c: Revert.
	* dwarf2-frame.c: Revert.
	* dwarf2-frame-tailcall.c: Revert.
	* dwarf-index-write.h: Revert.
	* dwarf-index-write.c: Revert.
	* dwarf-index-common.c: Revert.
	* dwarf-index-cache.h: Revert.
	* dwarf-index-cache.c: Revert.
	* dummy-frame.c: Revert.
	* dtrace-probe.c: Revert.
	* disasm.h: Revert.
	* disasm.c: Revert.
	* disasm-selftests.c: Revert.
	* dictionary.c: Revert.
	* dicos-tdep.c: Revert.
	* demangle.c: Revert.
	* dcache.h: Revert.
	* dcache.c: Revert.
	* darwin-nat.h: Revert.
	* darwin-nat.c: Revert.
	* darwin-nat-info.c: Revert.
	* d-valprint.c: Revert.
	* d-namespace.c: Revert.
	* d-lang.c: Revert.
	* ctf.c: Revert.
	* csky-tdep.c: Revert.
	* csky-linux-tdep.c: Revert.
	* cris-tdep.c: Revert.
	* cris-linux-tdep.c: Revert.
	* cp-valprint.c: Revert.
	* cp-support.c: Revert.
	* cp-namespace.c: Revert.
	* cp-abi.c: Revert.
	* corelow.c: Revert.
	* corefile.c: Revert.
	* continuations.c: Revert.
	* completer.h: Revert.
	* completer.c: Revert.
	* complaints.c: Revert.
	* coffread.c: Revert.
	* coff-pe-read.c: Revert.
	* cli-out.h: Revert.
	* cli-out.c: Revert.
	* charset.c: Revert.
	* c-varobj.c: Revert.
	* c-valprint.c: Revert.
	* c-typeprint.c: Revert.
	* c-lang.c: Revert.
	* buildsym.c: Revert.
	* buildsym-legacy.c: Revert.
	* build-id.h: Revert.
	* build-id.c: Revert.
	* btrace.c: Revert.
	* bsd-uthread.c: Revert.
	* breakpoint.h: Revert.
	* breakpoint.c: Revert.
	* break-catch-throw.c: Revert.
	* break-catch-syscall.c: Revert.
	* break-catch-sig.c: Revert.
	* blockframe.c: Revert.
	* block.c: Revert.
	* bfin-tdep.c: Revert.
	* bfin-linux-tdep.c: Revert.
	* bfd-target.c: Revert.
	* bcache.c: Revert.
	* ax-general.c: Revert.
	* ax-gdb.h: Revert.
	* ax-gdb.c: Revert.
	* avr-tdep.c: Revert.
	* auxv.c: Revert.
	* auto-load.c: Revert.
	* arm-wince-tdep.c: Revert.
	* arm-tdep.c: Revert.
	* arm-symbian-tdep.c: Revert.
	* arm-pikeos-tdep.c: Revert.
	* arm-obsd-tdep.c: Revert.
	* arm-nbsd-tdep.c: Revert.
	* arm-nbsd-nat.c: Revert.
	* arm-linux-tdep.c: Revert.
	* arm-linux-nat.c: Revert.
	* arm-fbsd-tdep.c: Revert.
	* arm-fbsd-nat.c: Revert.
	* arm-bsd-tdep.c: Revert.
	* arch-utils.c: Revert.
	* arc-tdep.c: Revert.
	* arc-newlib-tdep.c: Revert.
	* annotate.h: Revert.
	* annotate.c: Revert.
	* amd64-windows-tdep.c: Revert.
	* amd64-windows-nat.c: Revert.
	* amd64-tdep.c: Revert.
	* amd64-sol2-tdep.c: Revert.
	* amd64-obsd-tdep.c: Revert.
	* amd64-obsd-nat.c: Revert.
	* amd64-nbsd-tdep.c: Revert.
	* amd64-nbsd-nat.c: Revert.
	* amd64-nat.c: Revert.
	* amd64-linux-tdep.c: Revert.
	* amd64-linux-nat.c: Revert.
	* amd64-fbsd-tdep.c: Revert.
	* amd64-fbsd-nat.c: Revert.
	* amd64-dicos-tdep.c: Revert.
	* amd64-darwin-tdep.c: Revert.
	* amd64-bsd-nat.c: Revert.
	* alpha-tdep.c: Revert.
	* alpha-obsd-tdep.c: Revert.
	* alpha-nbsd-tdep.c: Revert.
	* alpha-mdebug-tdep.c: Revert.
	* alpha-linux-tdep.c: Revert.
	* alpha-linux-nat.c: Revert.
	* alpha-bsd-tdep.c: Revert.
	* alpha-bsd-nat.c: Revert.
	* aix-thread.c: Revert.
	* agent.c: Revert.
	* addrmap.c: Revert.
	* ada-varobj.c: Revert.
	* ada-valprint.c: Revert.
	* ada-typeprint.c: Revert.
	* ada-tasks.c: Revert.
	* ada-lang.c: Revert.
	* aarch64-tdep.c: Revert.
	* aarch64-ravenscar-thread.c: Revert.
	* aarch64-newlib-tdep.c: Revert.
	* aarch64-linux-tdep.c: Revert.
	* aarch64-linux-nat.c: Revert.
	* aarch64-fbsd-tdep.c: Revert.
	* aarch64-fbsd-nat.c: Revert.
	* aarch32-linux-nat.c: Revert.

gdb/ChangeLog

@@ -1,3 +1,168 @@
+2019-04-05  Tom Tromey  <tom@tromey.com>
+
+	Revert the header-sorting patch.
+	* ft32-tdep.c: Revert.
+	* frv-tdep.c: Revert.
+	* frv-linux-tdep.c: Revert.
+	* frame.c: Revert.
+	* frame-unwind.c: Revert.
+	* frame-base.c: Revert.
+	* fork-child.c: Revert.
+	* findvar.c: Revert.
+	* findcmd.c: Revert.
+	* filesystem.c: Revert.
+	* filename-seen-cache.h: Revert.
+	* filename-seen-cache.c: Revert.
+	* fbsd-tdep.c: Revert.
+	* fbsd-nat.h: Revert.
+	* fbsd-nat.c: Revert.
+	* f-valprint.c: Revert.
+	* f-typeprint.c: Revert.
+	* f-lang.c: Revert.
+	* extension.h: Revert.
+	* extension.c: Revert.
+	* extension-priv.h: Revert.
+	* expprint.c: Revert.
+	* exec.h: Revert.
+	* exec.c: Revert.
+	* exceptions.c: Revert.
+	* event-top.c: Revert.
+	* event-loop.c: Revert.
+	* eval.c: Revert.
+	* elfread.c: Revert.
+	* dwarf2read.h: Revert.
+	* dwarf2read.c: Revert.
+	* dwarf2loc.c: Revert.
+	* dwarf2expr.h: Revert.
+	* dwarf2expr.c: Revert.
+	* dwarf2-frame.c: Revert.
+	* dwarf2-frame-tailcall.c: Revert.
+	* dwarf-index-write.h: Revert.
+	* dwarf-index-write.c: Revert.
+	* dwarf-index-common.c: Revert.
+	* dwarf-index-cache.h: Revert.
+	* dwarf-index-cache.c: Revert.
+	* dummy-frame.c: Revert.
+	* dtrace-probe.c: Revert.
+	* disasm.h: Revert.
+	* disasm.c: Revert.
+	* disasm-selftests.c: Revert.
+	* dictionary.c: Revert.
+	* dicos-tdep.c: Revert.
+	* demangle.c: Revert.
+	* dcache.h: Revert.
+	* dcache.c: Revert.
+	* darwin-nat.h: Revert.
+	* darwin-nat.c: Revert.
+	* darwin-nat-info.c: Revert.
+	* d-valprint.c: Revert.
+	* d-namespace.c: Revert.
+	* d-lang.c: Revert.
+	* ctf.c: Revert.
+	* csky-tdep.c: Revert.
+	* csky-linux-tdep.c: Revert.
+	* cris-tdep.c: Revert.
+	* cris-linux-tdep.c: Revert.
+	* cp-valprint.c: Revert.
+	* cp-support.c: Revert.
+	* cp-namespace.c: Revert.
+	* cp-abi.c: Revert.
+	* corelow.c: Revert.
+	* corefile.c: Revert.
+	* continuations.c: Revert.
+	* completer.h: Revert.
+	* completer.c: Revert.
+	* complaints.c: Revert.
+	* coffread.c: Revert.
+	* coff-pe-read.c: Revert.
+	* cli-out.h: Revert.
+	* cli-out.c: Revert.
+	* charset.c: Revert.
+	* c-varobj.c: Revert.
+	* c-valprint.c: Revert.
+	* c-typeprint.c: Revert.
+	* c-lang.c: Revert.
+	* buildsym.c: Revert.
+	* buildsym-legacy.c: Revert.
+	* build-id.h: Revert.
+	* build-id.c: Revert.
+	* btrace.c: Revert.
+	* bsd-uthread.c: Revert.
+	* breakpoint.h: Revert.
+	* breakpoint.c: Revert.
+	* break-catch-throw.c: Revert.
+	* break-catch-syscall.c: Revert.
+	* break-catch-sig.c: Revert.
+	* blockframe.c: Revert.
+	* block.c: Revert.
+	* bfin-tdep.c: Revert.
+	* bfin-linux-tdep.c: Revert.
+	* bfd-target.c: Revert.
+	* bcache.c: Revert.
+	* ax-general.c: Revert.
+	* ax-gdb.h: Revert.
+	* ax-gdb.c: Revert.
+	* avr-tdep.c: Revert.
+	* auxv.c: Revert.
+	* auto-load.c: Revert.
+	* arm-wince-tdep.c: Revert.
+	* arm-tdep.c: Revert.
+	* arm-symbian-tdep.c: Revert.
+	* arm-pikeos-tdep.c: Revert.
+	* arm-obsd-tdep.c: Revert.
+	* arm-nbsd-tdep.c: Revert.
+	* arm-nbsd-nat.c: Revert.
+	* arm-linux-tdep.c: Revert.
+	* arm-linux-nat.c: Revert.
+	* arm-fbsd-tdep.c: Revert.
+	* arm-fbsd-nat.c: Revert.
+	* arm-bsd-tdep.c: Revert.
+	* arch-utils.c: Revert.
+	* arc-tdep.c: Revert.
+	* arc-newlib-tdep.c: Revert.
+	* annotate.h: Revert.
+	* annotate.c: Revert.
+	* amd64-windows-tdep.c: Revert.
+	* amd64-windows-nat.c: Revert.
+	* amd64-tdep.c: Revert.
+	* amd64-sol2-tdep.c: Revert.
+	* amd64-obsd-tdep.c: Revert.
+	* amd64-obsd-nat.c: Revert.
+	* amd64-nbsd-tdep.c: Revert.
+	* amd64-nbsd-nat.c: Revert.
+	* amd64-nat.c: Revert.
+	* amd64-linux-tdep.c: Revert.
+	* amd64-linux-nat.c: Revert.
+	* amd64-fbsd-tdep.c: Revert.
+	* amd64-fbsd-nat.c: Revert.
+	* amd64-dicos-tdep.c: Revert.
+	* amd64-darwin-tdep.c: Revert.
+	* amd64-bsd-nat.c: Revert.
+	* alpha-tdep.c: Revert.
+	* alpha-obsd-tdep.c: Revert.
+	* alpha-nbsd-tdep.c: Revert.
+	* alpha-mdebug-tdep.c: Revert.
+	* alpha-linux-tdep.c: Revert.
+	* alpha-linux-nat.c: Revert.
+	* alpha-bsd-tdep.c: Revert.
+	* alpha-bsd-nat.c: Revert.
+	* aix-thread.c: Revert.
+	* agent.c: Revert.
+	* addrmap.c: Revert.
+	* ada-varobj.c: Revert.
+	* ada-valprint.c: Revert.
+	* ada-typeprint.c: Revert.
+	* ada-tasks.c: Revert.
+	* ada-lang.c: Revert.
+	* aarch64-tdep.c: Revert.
+	* aarch64-ravenscar-thread.c: Revert.
+	* aarch64-newlib-tdep.c: Revert.
+	* aarch64-linux-tdep.c: Revert.
+	* aarch64-linux-nat.c: Revert.
+	* aarch64-fbsd-tdep.c: Revert.
+	* aarch64-fbsd-nat.c: Revert.
+	* aarch32-linux-nat.c: Revert.
+
 2019-04-05  Tom Tromey  <tom@tromey.com>
 
 	* ft32-tdep.c: Sort headers.

gdb/aarch32-linux-nat.c

@@ -17,12 +17,12 @@
 
 #include "defs.h"
 
-/* Local non-gdb includes.  */
-#include "aarch32-linux-nat.h"
-#include "arch/arm-linux.h"
-#include "arm-linux-tdep.h"
-#include "arm-tdep.h"
 #include "regcache.h"
+#include "arm-tdep.h"
+#include "arm-linux-tdep.h"
+#include "arch/arm-linux.h"
+
+#include "aarch32-linux-nat.h"
 
 /* Supply GP registers contents, stored in REGS, to REGCACHE.  ARM_APCS_32
    is true if the 32-bit mode is in use, otherwise, it is false.  */

gdb/aarch64-fbsd-nat.c

@@ -18,19 +18,17 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Standard C includes.  */
-#include <machine/reg.h>
-#include <sys/ptrace.h>
-#include <sys/types.h>
-
-/* Local non-gdb includes.  */
-#include "aarch64-fbsd-tdep.h"
-#include "aarch64-tdep.h"
-#include "fbsd-nat.h"
-#include "inf-ptrace.h"
 #include "target.h"
 
+#include <sys/types.h>
+#include <sys/ptrace.h>
+#include <machine/reg.h>
+
+#include "fbsd-nat.h"
+#include "aarch64-tdep.h"
+#include "aarch64-fbsd-tdep.h"
+#include "inf-ptrace.h"
+
 struct aarch64_fbsd_nat_target final : public fbsd_nat_target
 {
   void fetch_registers (struct regcache *, int) override;

gdb/aarch64-fbsd-tdep.c

@@ -19,16 +19,15 @@
 
 #include "defs.h"
 
-/* Local non-gdb includes.  */
-#include "aarch64-fbsd-tdep.h"
-#include "aarch64-tdep.h"
-#include "fbsd-tdep.h"
 #include "gdbarch.h"
+#include "fbsd-tdep.h"
+#include "aarch64-tdep.h"
+#include "aarch64-fbsd-tdep.h"
 #include "osabi.h"
 #include "solib-svr4.h"
 #include "target.h"
-#include "trad-frame.h"
 #include "tramp-frame.h"
+#include "trad-frame.h"
 
 /* Register maps.  */
 

gdb/aarch64-linux-nat.c

@@ -20,29 +20,29 @@
 
 #include "defs.h"
 
-/* Standard C includes.  */
-#include <asm/ptrace.h>
-#include <sys/utsname.h>
-
-/* Local non-gdb includes.  */
-#include "aarch32-linux-nat.h"
-#include "aarch64-linux-tdep.h"
-#include "aarch64-tdep.h"
-#include "auxv.h"
-#include "elf/common.h"
-#include "elf/external.h"
-#include "gdbcmd.h"
-#include "gdbcore.h"
-#include "gregset.h"
 #include "inferior.h"
-#include "linux-nat.h"
+#include "gdbcore.h"
-#include "linux-tdep.h"
-#include "nat/aarch64-linux-hw-point.h"
-#include "nat/aarch64-linux.h"
-#include "nat/aarch64-sve-linux-ptrace.h"
-#include "nat/gdb_ptrace.h"
 #include "regcache.h"
+#include "linux-nat.h"
 #include "target-descriptions.h"
+#include "auxv.h"
+#include "gdbcmd.h"
+#include "aarch64-tdep.h"
+#include "aarch64-linux-tdep.h"
+#include "aarch32-linux-nat.h"
+#include "nat/aarch64-linux.h"
+#include "nat/aarch64-linux-hw-point.h"
+#include "nat/aarch64-sve-linux-ptrace.h"
+
+#include "elf/external.h"
+#include "elf/common.h"
+
+#include "nat/gdb_ptrace.h"
+#include <sys/utsname.h>
+#include <asm/ptrace.h>
+
+#include "gregset.h"
+#include "linux-tdep.h"
 
 /* Defines ps_err_e, struct ps_prochandle.  */
 #include "gdb_proc_service.h"

gdb/aarch64-linux-tdep.c

@@ -20,33 +20,33 @@
 
 #include "defs.h"
 
-/* Standard C includes.  */
-#include <ctype.h>
-
-/* Local non-gdb includes.  */
-#include "aarch64-linux-tdep.h"
-#include "aarch64-tdep.h"
-#include "arch-utils.h"
-#include "auxv.h"
-#include "cli/cli-utils.h"
-#include "elf/common.h"
 #include "gdbarch.h"
+#include "arch-utils.h"
 #include "glibc-tdep.h"
-#include "inferior.h"
-#include "linux-record.h"
 #include "linux-tdep.h"
+#include "aarch64-tdep.h"
+#include "aarch64-linux-tdep.h"
 #include "osabi.h"
-#include "parser-defs.h"
+#include "solib-svr4.h"
-#include "record-full.h"
+#include "symtab.h"
+#include "tramp-frame.h"
+#include "trad-frame.h"
+
+#include "inferior.h"
 #include "regcache.h"
 #include "regset.h"
-#include "solib-svr4.h"
+
+#include "cli/cli-utils.h"
 #include "stap-probe.h"
-#include "symtab.h"
+#include "parser-defs.h"
-#include "trad-frame.h"
-#include "tramp-frame.h"
 #include "user-regs.h"
 #include "xml-syscall.h"
+#include <ctype.h>
+
+#include "record-full.h"
+#include "linux-record.h"
+#include "auxv.h"
+#include "elf/common.h"
 
 /* Signal frame handling.
 

gdb/aarch64-newlib-tdep.c

@@ -20,9 +20,8 @@
 
 #include "defs.h"
 
-/* Local non-gdb includes.  */
-#include "aarch64-tdep.h"
 #include "gdbarch.h"
+#include "aarch64-tdep.h"
 #include "osabi.h"
 
 /* Implement the 'init_osabi' method of struct gdb_osabi_handler.  */

gdb/aarch64-ravenscar-thread.c

@@ -18,14 +18,12 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
-#include "aarch64-ravenscar-thread.h"
-#include "aarch64-tdep.h"
 #include "gdbcore.h"
+#include "regcache.h"
+#include "aarch64-tdep.h"
 #include "inferior.h"
 #include "ravenscar-thread.h"
-#include "regcache.h"
+#include "aarch64-ravenscar-thread.h"
 
 #define NO_OFFSET -1
 

gdb/aarch64-tdep.c

@@ -20,44 +20,46 @@
 
 #include "defs.h"
 
-/* Standard C++ includes.  */
-#include <algorithm>
-
-/* Local non-gdb includes.  */
-#include "aarch64-ravenscar-thread.h"
-#include "aarch64-tdep.h"
-#include "arch-utils.h"
-#include "arch/aarch64-insn.h"
-#include "ax-gdb.h"
-#include "ax.h"
-#include "common/selftest.h"
-#include "common/vec.h"
-#include "dis-asm.h"
-#include "dwarf2-frame.h"
-#include "dwarf2.h"
-#include "elf-bfd.h"
-#include "elf/aarch64.h"
-#include "frame-base.h"
-#include "frame-unwind.h"
 #include "frame.h"
+#include "inferior.h"
 #include "gdbcmd.h"
 #include "gdbcore.h"
-#include "gdbtypes.h"
+#include "dis-asm.h"
-#include "infcall.h"
-#include "inferior.h"
-#include "language.h"
-#include "objfiles.h"
-#include "opcode/aarch64.h"
-#include "osabi.h"
-#include "prologue-value.h"
-#include "record-full.h"
-#include "record.h"
 #include "regcache.h"
 #include "reggroups.h"
-#include "target-descriptions.h"
-#include "trad-frame.h"
-#include "user-regs.h"
 #include "value.h"
+#include "arch-utils.h"
+#include "osabi.h"
+#include "frame-unwind.h"
+#include "frame-base.h"
+#include "trad-frame.h"
+#include "objfiles.h"
+#include "dwarf2.h"
+#include "dwarf2-frame.h"
+#include "gdbtypes.h"
+#include "prologue-value.h"
+#include "target-descriptions.h"
+#include "user-regs.h"
+#include "language.h"
+#include "infcall.h"
+#include "ax.h"
+#include "ax-gdb.h"
+#include "common/selftest.h"
+
+#include "aarch64-tdep.h"
+#include "aarch64-ravenscar-thread.h"
+
+#include "elf-bfd.h"
+#include "elf/aarch64.h"
+
+#include "common/vec.h"
+
+#include "record.h"
+#include "record-full.h"
+#include "arch/aarch64-insn.h"
+
+#include "opcode/aarch64.h"
+#include <algorithm>
 
 #define submask(x) ((1L << ((x) + 1)) - 1)
 #define bit(obj,st) (((obj) >> (st)) & 1)

gdb/ada-lang.c

@@ -19,55 +19,50 @@
 
 
 #include "defs.h"
-
-/* Standard C includes.  */
 #include <ctype.h>
-#include <sys/stat.h>
-
-/* Standard C++ includes.  */
-#include <algorithm>
-
-/* Local non-gdb includes.  */
-#include "ada-lang.h"
-#include "annotate.h"
-#include "arch-utils.h"
-#include "block.h"
-#include "breakpoint.h"
-#include "c-lang.h"
-#include "cli/cli-utils.h"
-#include "common/byte-vector.h"
-#include "common/function-view.h"
-#include "common/gdb_vecs.h"
-#include "common/vec.h"
-#include "completer.h"
 #include "demangle.h"
-#include "dictionary.h"
-#include "expression.h"
-#include "frame.h"
-#include "gdb_obstack.h"
 #include "gdb_regex.h"
-#include "gdbcmd.h"
+#include "frame.h"
-#include "gdbcore.h"
-#include "gdbtypes.h"
-#include "hashtab.h"
-#include "infcall.h"
-#include "inferior.h"
-#include "language.h"
-#include "mi/mi-common.h"
-#include "namespace.h"
-#include "objfiles.h"
-#include "observable.h"
-#include "parser-defs.h"
-#include "psymtab.h"
-#include "source.h"
-#include "stack.h"
-#include "symfile.h"
 #include "symtab.h"
-#include "typeprint.h"
+#include "gdbtypes.h"
-#include "ui-out.h"
+#include "gdbcmd.h"
-#include "valprint.h"
+#include "expression.h"
-#include "value.h"
+#include "parser-defs.h"
+#include "language.h"
 #include "varobj.h"
+#include "c-lang.h"
+#include "inferior.h"
+#include "symfile.h"
+#include "objfiles.h"
+#include "breakpoint.h"
+#include "gdbcore.h"
+#include "hashtab.h"
+#include "gdb_obstack.h"
+#include "ada-lang.h"
+#include "completer.h"
+#include <sys/stat.h>
+#include "ui-out.h"
+#include "block.h"
+#include "infcall.h"
+#include "dictionary.h"
+#include "annotate.h"
+#include "valprint.h"
+#include "source.h"
+#include "observable.h"
+#include "common/vec.h"
+#include "stack.h"
+#include "common/gdb_vecs.h"
+#include "typeprint.h"
+#include "namespace.h"
+
+#include "psymtab.h"
+#include "value.h"
+#include "mi/mi-common.h"
+#include "arch-utils.h"
+#include "cli/cli-utils.h"
+#include "common/function-view.h"
+#include "common/byte-vector.h"
+#include <algorithm>
 
 /* Define whether or not the C operator '/' truncates towards zero for
    differently signed operands (truncation direction is undefined in C).

gdb/ada-tasks.c

@@ -16,17 +16,15 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
-#include "ada-lang.h"
-#include "gdbcmd.h"
-#include "gdbcore.h"
-#include "gdbthread.h"
-#include "inferior.h"
-#include "objfiles.h"
 #include "observable.h"
-#include "progspace.h"
+#include "gdbcmd.h"
 #include "target.h"
+#include "ada-lang.h"
+#include "gdbcore.h"
+#include "inferior.h"
+#include "gdbthread.h"
+#include "progspace.h"
+#include "objfiles.h"
 
 static int ada_build_task_list ();
 

gdb/ada-typeprint.c

@@ -17,28 +17,24 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
+#include "gdb_obstack.h"
-/* Standard C includes.  */
+#include "bfd.h"		/* Binary File Description */
-#include <ctype.h>
+#include "symtab.h"
-
+#include "gdbtypes.h"
-/* Local non-gdb includes.  */
+#include "expression.h"
-#include "ada-lang.h"
+#include "value.h"
-#include "bfd.h"
+#include "gdbcore.h"
+#include "target.h"
+#include "command.h"
+#include "gdbcmd.h"
+#include "language.h"
+#include "demangle.h"
 #include "c-lang.h"
 #include "cli/cli-style.h"
-#include "command.h"
-#include "demangle.h"
-#include "expression.h"
-#include "gdb_obstack.h"
-#include "gdbcmd.h"
-#include "gdbcore.h"
-#include "gdbtypes.h"
-#include "language.h"
-#include "symtab.h"
-#include "target-float.h"
-#include "target.h"
 #include "typeprint.h"
-#include "value.h"
+#include "target-float.h"
+#include "ada-lang.h"
+#include <ctype.h>
 
 static int print_selected_record_field_types (struct type *, struct type *,
 					      int, int,

gdb/ada-valprint.c

@@ -18,24 +18,20 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Standard C includes.  */
 #include <ctype.h>
-
-/* Local non-gdb includes.  */
-#include "ada-lang.h"
-#include "annotate.h"
-#include "c-lang.h"
-#include "demangle.h"
-#include "expression.h"
-#include "gdbtypes.h"
-#include "infcall.h"
-#include "language.h"
-#include "objfiles.h"
 #include "symtab.h"
-#include "target-float.h"
+#include "gdbtypes.h"
-#include "valprint.h"
+#include "expression.h"
 #include "value.h"
+#include "demangle.h"
+#include "valprint.h"
+#include "language.h"
+#include "annotate.h"
+#include "ada-lang.h"
+#include "c-lang.h"
+#include "infcall.h"
+#include "objfiles.h"
+#include "target-float.h"
 
 static int print_field_values (struct type *, const gdb_byte *,
 			       int,

gdb/ada-varobj.c

@@ -18,12 +18,10 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
 #include "ada-lang.h"
+#include "varobj.h"
 #include "language.h"
 #include "valprint.h"
-#include "varobj.h"
 
 /* Implementation principle used in this unit:
 

gdb/addrmap.c

@@ -18,11 +18,9 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
-#include "addrmap.h"
-#include "gdb_obstack.h"
 #include "splay-tree.h"
+#include "gdb_obstack.h"
+#include "addrmap.h"
 
 
 /* The "abstract class".  */

gdb/agent.c

@@ -16,12 +16,10 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
 #include "command.h"
-#include "common/agent.h"
 #include "gdbcmd.h"
 #include "target.h"
+#include "common/agent.h"
 
 /* Enum strings for "set|show agent".  */
 

gdb/aix-thread.c

@@ -40,24 +40,21 @@
      */
 
 #include "defs.h"
+#include "gdbthread.h"
+#include "target.h"
+#include "inferior.h"
+#include "regcache.h"
+#include "gdbcmd.h"
+#include "ppc-tdep.h"
+#include "observable.h"
+#include "objfiles.h"
 
-/* Standard C includes.  */
 #include <procinfo.h>
-#include <sched.h>
+#include <sys/types.h>
-#include <sys/pthdebug.h>
 #include <sys/ptrace.h>
 #include <sys/reg.h>
-#include <sys/types.h>
+#include <sched.h>
-
+#include <sys/pthdebug.h>
-/* Local non-gdb includes.  */
-#include "gdbcmd.h"
-#include "gdbthread.h"
-#include "inferior.h"
-#include "objfiles.h"
-#include "observable.h"
-#include "ppc-tdep.h"
-#include "regcache.h"
-#include "target.h"
 
 #if !HAVE_DECL_GETTHRDS
 extern int getthrds (pid_t, struct thrdsinfo64 *, int, tid_t *, int);

gdb/alpha-bsd-nat.c

@@ -18,21 +18,20 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
+#include "inferior.h"
+#include "regcache.h"
 
-/* Standard C includes.  */
+#include "alpha-tdep.h"
+#include "alpha-bsd-tdep.h"
+#include "inf-ptrace.h"
+
+#include <sys/types.h>
+#include <sys/ptrace.h>
 #include <machine/reg.h>
+
 #ifdef HAVE_SYS_PROCFS_H
 #include <sys/procfs.h>
 #endif
-#include <sys/ptrace.h>
-#include <sys/types.h>
-
-/* Local non-gdb includes.  */
-#include "alpha-bsd-tdep.h"
-#include "alpha-tdep.h"
-#include "inf-ptrace.h"
-#include "inferior.h"
-#include "regcache.h"
 
 #ifndef HAVE_GREGSET_T
 typedef struct reg gregset_t;

gdb/alpha-bsd-tdep.c

@@ -18,12 +18,11 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
-#include "alpha-bsd-tdep.h"
-#include "alpha-tdep.h"
 #include "regcache.h"
 
+#include "alpha-tdep.h"
+#include "alpha-bsd-tdep.h"
+
 /* Conviently, GDB uses the same register numbering as the
    ptrace register structure used by BSD on Alpha.  */
 

gdb/alpha-linux-nat.c

@@ -17,18 +17,17 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Standard C includes.  */
-#include <alpha/ptrace.h>
-#include <sys/procfs.h>
-
-/* Local non-gdb includes.  */
-#include "alpha-tdep.h"
-#include "gregset.h"
-#include "linux-nat-trad.h"
-#include "nat/gdb_ptrace.h"
-#include "regcache.h"
 #include "target.h"
+#include "regcache.h"
+#include "linux-nat-trad.h"
+
+#include "alpha-tdep.h"
+
+#include "nat/gdb_ptrace.h"
+#include <alpha/ptrace.h>
+
+#include <sys/procfs.h>
+#include "gregset.h"
 
 /* The address of UNIQUE for ptrace.  */
 #define ALPHA_UNIQUE_PTRACE_ADDR 65

gdb/alpha-linux-tdep.c

@@ -17,16 +17,14 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
-#include "alpha-tdep.h"
 #include "frame.h"
-#include "linux-tdep.h"
 #include "osabi.h"
-#include "regcache.h"
-#include "regset.h"
 #include "solib-svr4.h"
 #include "symtab.h"
+#include "regset.h"
+#include "regcache.h"
+#include "linux-tdep.h"
+#include "alpha-tdep.h"
 
 /* This enum represents the signals' numbers on the Alpha
    architecture.  It just contains the signal definitions which are

gdb/alpha-mdebug-tdep.c

@@ -17,18 +17,17 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
-#include "alpha-tdep.h"
-#include "block.h"
-#include "frame-base.h"
-#include "frame-unwind.h"
 #include "frame.h"
-#include "gdbcore.h"
+#include "frame-unwind.h"
-#include "mdebugread.h"
+#include "frame-base.h"
 #include "symtab.h"
+#include "gdbcore.h"
+#include "block.h"
 #include "trad-frame.h"
 
+#include "alpha-tdep.h"
+#include "mdebugread.h"
+
 /* FIXME: Some of this code should perhaps be merged with mips.  */
 
 /* *INDENT-OFF* */

gdb/alpha-nbsd-tdep.c

@@ -20,19 +20,18 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
-#include "alpha-bsd-tdep.h"
-#include "alpha-tdep.h"
 #include "frame.h"
 #include "gdbcore.h"
-#include "nbsd-tdep.h"
 #include "osabi.h"
 #include "regcache.h"
 #include "regset.h"
+#include "value.h"
+
+#include "alpha-tdep.h"
+#include "alpha-bsd-tdep.h"
+#include "nbsd-tdep.h"
 #include "solib-svr4.h"
 #include "target.h"
-#include "value.h"
 
 /* Core file support.  */
 

gdb/alpha-obsd-tdep.c

@@ -18,14 +18,13 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
-#include "alpha-bsd-tdep.h"
-#include "alpha-tdep.h"
 #include "frame.h"
 #include "gdbcore.h"
-#include "obsd-tdep.h"
 #include "osabi.h"
+
+#include "obsd-tdep.h"
+#include "alpha-tdep.h"
+#include "alpha-bsd-tdep.h"
 #include "solib-svr4.h"
 
 /* Signal trampolines.  */

gdb/alpha-tdep.c

@@ -18,33 +18,31 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Standard C++ includes.  */
-#include <algorithm>
-
-/* Local non-gdb includes.  */
-#include "alpha-tdep.h"
-#include "arch-utils.h"
-#include "block.h"
-#include "dis-asm.h"
-#include "dwarf2-frame.h"
-#include "elf-bfd.h"
-#include "frame-base.h"
-#include "frame-unwind.h"
 #include "frame.h"
+#include "frame-unwind.h"
+#include "frame-base.h"
+#include "dwarf2-frame.h"
+#include "inferior.h"
+#include "symtab.h"
+#include "value.h"
 #include "gdbcmd.h"
 #include "gdbcore.h"
-#include "infcall.h"
+#include "dis-asm.h"
-#include "inferior.h"
+#include "symfile.h"
-#include "linespec.h"
 #include "objfiles.h"
-#include "osabi.h"
+#include "linespec.h"
 #include "regcache.h"
 #include "reggroups.h"
-#include "symfile.h"
+#include "arch-utils.h"
-#include "symtab.h"
+#include "osabi.h"
+#include "block.h"
+#include "infcall.h"
 #include "trad-frame.h"
-#include "value.h"
+
+#include "elf-bfd.h"
+
+#include "alpha-tdep.h"
+#include <algorithm>
 
 /* Instruction decoding.  The notations for registers, immediates and
    opcodes are the same as the one used in Compaq's Alpha architecture

gdb/amd64-bsd-nat.c

@@ -18,8 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
 #include "inferior.h"
 #include "regcache.h"
 #include "target.h"

gdb/amd64-darwin-tdep.c

@@ -19,25 +19,24 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
-#include "amd64-darwin-tdep.h"
-#include "amd64-tdep.h"
-#include "common/x86-xstate.h"
-#include "dwarf2-frame.h"
 #include "frame.h"
-#include "gdbcore.h"
-#include "i386-darwin-tdep.h"
-#include "i387-tdep.h"
 #include "inferior.h"
-#include "objfiles.h"
+#include "gdbcore.h"
-#include "osabi.h"
-#include "regcache.h"
-#include "solib-darwin.h"
-#include "solib.h"
-#include "symtab.h"
 #include "target.h"
+#include "symtab.h"
+#include "regcache.h"
+#include "objfiles.h"
+
+#include "i387-tdep.h"
+#include "common/x86-xstate.h"
+#include "amd64-tdep.h"
+#include "osabi.h"
 #include "ui-out.h"
+#include "amd64-darwin-tdep.h"
+#include "i386-darwin-tdep.h"
+#include "solib.h"
+#include "solib-darwin.h"
+#include "dwarf2-frame.h"
 
 /* Offsets into the struct x86_thread_state64 where we'll find the saved regs.
    From <mach/i386/thread_status.h> and amd64-tdep.h.  */

gdb/amd64-dicos-tdep.c

@@ -18,12 +18,10 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
+#include "osabi.h"
-/* Local non-gdb includes.  */
 #include "amd64-tdep.h"
 #include "common/x86-xstate.h"
 #include "dicos-tdep.h"
-#include "osabi.h"
 
 static void
 amd64_dicos_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)

gdb/amd64-fbsd-nat.c

@@ -18,26 +18,23 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Standard C includes.  */
-#include <machine/reg.h>
-#include <signal.h>
-#include <sys/ptrace.h>
-#include <sys/sysctl.h>
-#include <sys/types.h>
-#include <sys/user.h>
-
-/* Local non-gdb includes.  */
-#include "amd64-bsd-nat.h"
-#include "amd64-nat.h"
-#include "amd64-tdep.h"
-#include "common/x86-xstate.h"
-#include "fbsd-nat.h"
 #include "inferior.h"
 #include "regcache.h"
 #include "target.h"
-#include "x86-nat.h"
 
+#include <signal.h>
+#include <sys/types.h>
+#include <sys/ptrace.h>
+#include <sys/sysctl.h>
+#include <sys/user.h>
+#include <machine/reg.h>
+
+#include "fbsd-nat.h"
+#include "amd64-tdep.h"
+#include "amd64-nat.h"
+#include "amd64-bsd-nat.h"
+#include "x86-nat.h"
+#include "common/x86-xstate.h"
 
 
 class amd64_fbsd_nat_target final

gdb/amd64-fbsd-tdep.c

@@ -18,18 +18,17 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
-#include "amd64-tdep.h"
 #include "arch-utils.h"
-#include "common/x86-xstate.h"
-#include "fbsd-tdep.h"
 #include "frame.h"
 #include "gdbcore.h"
-#include "i386-fbsd-tdep.h"
-#include "osabi.h"
 #include "regcache.h"
+#include "osabi.h"
 #include "regset.h"
+#include "i386-fbsd-tdep.h"
+#include "common/x86-xstate.h"
+
+#include "amd64-tdep.h"
+#include "fbsd-tdep.h"
 #include "solib-svr4.h"
 
 /* Support for signal handlers.  */

gdb/amd64-linux-nat.c

@@ -19,27 +19,25 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
+#include "inferior.h"
-/* Standard C includes.  */
+#include "regcache.h"
+#include "elf/common.h"
+#include <sys/uio.h>
+#include "nat/gdb_ptrace.h"
 #include <asm/prctl.h>
 #include <sys/reg.h>
-#include <sys/uio.h>
+#include "gregset.h"
+#include "gdb_proc_service.h"
 
-/* Local non-gdb includes.  */
-#include "amd64-linux-tdep.h"
 #include "amd64-nat.h"
 #include "amd64-tdep.h"
-#include "common/x86-xstate.h"
+#include "amd64-linux-tdep.h"
-#include "elf/common.h"
-#include "gdb_proc_service.h"
-#include "gregset.h"
 #include "i386-linux-tdep.h"
-#include "inferior.h"
+#include "common/x86-xstate.h"
-#include "nat/amd64-linux-siginfo.h"
+
-#include "nat/gdb_ptrace.h"
-#include "nat/linux-ptrace.h"
-#include "regcache.h"
 #include "x86-linux-nat.h"
+#include "nat/linux-ptrace.h"
+#include "nat/amd64-linux-siginfo.h"
 
 /* This definition comes from prctl.h.  Kernels older than 2.5.64
    do not have it.  */

gdb/amd64-linux-tdep.c

@@ -19,29 +19,28 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
-#include "amd64-linux-tdep.h"
-#include "amd64-tdep.h"
 #include "arch-utils.h"
-#include "arch/amd64.h"
-#include "common/x86-xstate.h"
 #include "frame.h"
 #include "gdbcore.h"
-#include "gdbtypes.h"
-#include "glibc-tdep.h"
-#include "i386-linux-tdep.h"
-#include "linux-tdep.h"
-#include "osabi.h"
-#include "parser-defs.h"
 #include "regcache.h"
+#include "osabi.h"
+#include "symtab.h"
+#include "gdbtypes.h"
 #include "reggroups.h"
 #include "regset.h"
-#include "solib-svr4.h"
+#include "parser-defs.h"
-#include "symtab.h"
-#include "target-descriptions.h"
 #include "user-regs.h"
+#include "amd64-linux-tdep.h"
+#include "i386-linux-tdep.h"
+#include "linux-tdep.h"
+#include "common/x86-xstate.h"
+
+#include "amd64-tdep.h"
+#include "solib-svr4.h"
 #include "xml-syscall.h"
+#include "glibc-tdep.h"
+#include "arch/amd64.h"
+#include "target-descriptions.h"
 
 /* The syscall's XML filename for i386.  */
 #define XML_SYSCALL_FILENAME_AMD64 "syscalls/amd64-linux.xml"

gdb/amd64-nat.c

@@ -18,14 +18,13 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
-#include "amd64-nat.h"
-#include "amd64-tdep.h"
 #include "gdbarch.h"
-#include "i386-tdep.h"
 #include "regcache.h"
 
+#include "i386-tdep.h"
+#include "amd64-tdep.h"
+#include "amd64-nat.h"
+
 /* The following bits of code help with implementing debugging 32-bit
    code natively on AMD64.  The idea is to define two mappings between
    the register number as used by GDB and the register set used by the

gdb/amd64-nbsd-nat.c

@@ -18,13 +18,12 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
+#include "target.h"
 
-/* Local non-gdb includes.  */
+#include "nbsd-nat.h"
+#include "amd64-tdep.h"
 #include "amd64-bsd-nat.h"
 #include "amd64-nat.h"
-#include "amd64-tdep.h"
-#include "nbsd-nat.h"
-#include "target.h"
 
 /* Mapping between the general-purpose registers in NetBSD/amd64
    `struct reg' format and GDB's register cache layout for

gdb/amd64-nbsd-tdep.c

@@ -18,18 +18,17 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
-#include "amd64-tdep.h"
 #include "arch-utils.h"
-#include "common/x86-xstate.h"
 #include "frame.h"
 #include "gdbcore.h"
-#include "nbsd-tdep.h"
 #include "osabi.h"
-#include "solib-svr4.h"
 #include "symtab.h"
 
+#include "amd64-tdep.h"
+#include "common/x86-xstate.h"
+#include "nbsd-tdep.h"
+#include "solib-svr4.h"
+
 /* Support for signal handlers.  */
 
 /* Return whether THIS_FRAME corresponds to a NetBSD sigtramp

gdb/amd64-obsd-nat.c

@@ -18,16 +18,15 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
-#include "amd64-bsd-nat.h"
-#include "amd64-nat.h"
-#include "amd64-tdep.h"
 #include "gdbcore.h"
-#include "obsd-nat.h"
 #include "regcache.h"
 #include "target.h"
 
+#include "amd64-tdep.h"
+#include "amd64-bsd-nat.h"
+#include "amd64-nat.h"
+#include "obsd-nat.h"
+
 /* Mapping between the general-purpose registers in OpenBSD/amd64
    `struct reg' format and GDB's register cache layout for
    OpenBSD/i386.

gdb/amd64-obsd-tdep.c

@@ -18,25 +18,24 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
-#include "amd64-tdep.h"
-#include "bsd-uthread.h"
-#include "common/x86-xstate.h"
-#include "frame-unwind.h"
 #include "frame.h"
+#include "frame-unwind.h"
 #include "gdbcore.h"
-#include "i387-tdep.h"
+#include "symtab.h"
 #include "objfiles.h"
-#include "obsd-tdep.h"
 #include "osabi.h"
 #include "regcache.h"
 #include "regset.h"
-#include "solib-svr4.h"
-#include "symtab.h"
 #include "target.h"
 #include "trad-frame.h"
 
+#include "obsd-tdep.h"
+#include "amd64-tdep.h"
+#include "i387-tdep.h"
+#include "common/x86-xstate.h"
+#include "solib-svr4.h"
+#include "bsd-uthread.h"
+
 /* Support for signal handlers.  */
 
 /* Default page size.  */

gdb/amd64-sol2-tdep.c

@@ -20,18 +20,17 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
-#include "amd64-tdep.h"
-#include "common/x86-xstate.h"
 #include "frame.h"
 #include "gdbcore.h"
-#include "osabi.h"
 #include "regcache.h"
-#include "sol2-tdep.h"
+#include "osabi.h"
-#include "solib-svr4.h"
 #include "symtab.h"
 
+#include "sol2-tdep.h"
+#include "amd64-tdep.h"
+#include "common/x86-xstate.h"
+#include "solib-svr4.h"
+
 /* Mapping between the general-purpose registers in gregset_t format
    and GDB's register cache layout.  */
 

gdb/amd64-tdep.c

@@ -20,38 +20,34 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
+#include "opcode/i386.h"
-/* Standard C++ includes.  */
-#include <algorithm>
-
-/* Local non-gdb includes.  */
-#include "amd64-tdep.h"
-#include "arch-utils.h"
-#include "arch/amd64.h"
-#include "ax-gdb.h"
-#include "ax.h"
-#include "block.h"
-#include "common/byte-vector.h"
-#include "common/x86-xstate.h"
 #include "dis-asm.h"
-#include "disasm.h"
+#include "arch-utils.h"
+#include "block.h"
 #include "dummy-frame.h"
+#include "frame.h"
 #include "frame-base.h"
 #include "frame-unwind.h"
-#include "frame.h"
-#include "gdbcmd.h"
-#include "gdbcore.h"
-#include "i387-tdep.h"
 #include "inferior.h"
 #include "infrun.h"
+#include "gdbcmd.h"
+#include "gdbcore.h"
 #include "objfiles.h"
-#include "opcode/i386.h"
-#include "osabi.h"
-#include "producer.h"
 #include "regcache.h"
 #include "regset.h"
 #include "symfile.h"
+#include "disasm.h"
+#include "amd64-tdep.h"
+#include "i387-tdep.h"
+#include "common/x86-xstate.h"
+#include <algorithm>
 #include "target-descriptions.h"
+#include "arch/amd64.h"
+#include "producer.h"
+#include "ax.h"
+#include "ax-gdb.h"
+#include "common/byte-vector.h"
+#include "osabi.h"
 #include "x86-tdep.h"
 
 /* Note that the AMD64 architecture was previously known as x86-64.

gdb/amd64-windows-nat.c

@@ -16,14 +16,11 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Standard C includes.  */
-#include <windows.h>
-
-/* Local non-gdb includes.  */
-#include "amd64-tdep.h"
 #include "windows-nat.h"
 #include "x86-nat.h"
+#include "amd64-tdep.h"
+
+#include <windows.h>
 
 #define context_offset(x) (offsetof (CONTEXT, x))
 static const int mappings[] =

gdb/amd64-windows-tdep.c

@@ -16,26 +16,22 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Standard C++ includes.  */
-#include <algorithm>
-
-/* Local non-gdb includes.  */
-#include "amd64-tdep.h"
-#include "coff/i386.h"
-#include "coff/internal.h"
-#include "coff/pe.h"
-#include "common/x86-xstate.h"
-#include "frame-unwind.h"
-#include "frame.h"
-#include "gdbcore.h"
-#include "gdbtypes.h"
-#include "libcoff.h"
-#include "objfiles.h"
 #include "osabi.h"
+#include "amd64-tdep.h"
+#include "common/x86-xstate.h"
+#include "gdbtypes.h"
+#include "gdbcore.h"
 #include "regcache.h"
-#include "value.h"
 #include "windows-tdep.h"
+#include "frame.h"
+#include "objfiles.h"
+#include "frame-unwind.h"
+#include "coff/internal.h"
+#include "coff/i386.h"
+#include "coff/pe.h"
+#include "libcoff.h"
+#include "value.h"
+#include <algorithm>
 
 /* The registers used to pass integer arguments during a function call.  */
 static int amd64_windows_dummy_call_integer_regs[] =

gdb/annotate.c

@@ -17,18 +17,15 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
 #include "annotate.h"
-#include "breakpoint.h"
+#include "value.h"
+#include "target.h"
 #include "gdbtypes.h"
+#include "breakpoint.h"
+#include "observable.h"
 #include "inferior.h"
 #include "infrun.h"
-#include "observable.h"
-#include "target.h"
 #include "top.h"
-#include "value.h"
-
 
 
 /* Prototypes for local functions.  */

gdb/annotate.h

@@ -19,8 +19,8 @@
 #ifndef ANNOTATE_H
 #define ANNOTATE_H
 
-#include "gdbtypes.h"
 #include "symtab.h"
+#include "gdbtypes.h"
 
 extern void annotate_breakpoint (int);
 extern void annotate_catchpoint (int);

gdb/arc-newlib-tdep.c

@@ -20,9 +20,8 @@
 
 #include "defs.h"
 
-/* Local non-gdb includes.  */
-#include "arc-tdep.h"
 #include "gdbarch.h"
+#include "arc-tdep.h"
 #include "osabi.h"
 
 /* Implement the 'init_osabi' method of struct gdb_osabi_handler.  */

gdb/arc-tdep.c

@@ -20,15 +20,13 @@
 
 /* GDB header files.  */
 #include "defs.h"
-
-/* Local non-gdb includes.  */
 #include "arch-utils.h"
 #include "disasm.h"
 #include "dwarf2-frame.h"
 #include "frame-base.h"
 #include "frame-unwind.h"
-#include "gdbcmd.h"
 #include "gdbcore.h"
+#include "gdbcmd.h"
 #include "objfiles.h"
 #include "prologue-value.h"
 #include "trad-frame.h"

gdb/arch-utils.c

@@ -19,22 +19,24 @@
 
 #include "defs.h"
 
-/* Local non-gdb includes.  */
 #include "arch-utils.h"
-#include "common/version.h"
-#include "dis-asm.h"
-#include "floatformat.h"
 #include "gdbcmd.h"
-#include "gdbcore.h"
+#include "inferior.h"		/* enum CALL_DUMMY_LOCATION et al.  */
-#include "inferior.h"
 #include "infrun.h"
-#include "language.h"
-#include "objfiles.h"
-#include "osabi.h"
 #include "regcache.h"
 #include "sim-regno.h"
-#include "symtab.h"
+#include "gdbcore.h"
+#include "osabi.h"
 #include "target-descriptions.h"
+#include "objfiles.h"
+#include "language.h"
+#include "symtab.h"
+
+#include "common/version.h"
+
+#include "floatformat.h"
+
+#include "dis-asm.h"
 
 int
 default_displaced_step_hw_singlestep (struct gdbarch *gdbarch,

gdb/arm-bsd-tdep.c

@@ -18,13 +18,12 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
-#include "arm-tdep.h"
 #include "osabi.h"
 #include "regcache.h"
 #include "regset.h"
 
+#include "arm-tdep.h"
+
 /* Core file support.  */
 
 /* Sizeof `struct reg' in <machine/reg.h>.  */

gdb/arm-fbsd-nat.c

@@ -18,19 +18,17 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Standard C includes.  */
-#include <machine/reg.h>
-#include <sys/ptrace.h>
-#include <sys/types.h>
-
-/* Local non-gdb includes.  */
-#include "arm-fbsd-tdep.h"
-#include "arm-tdep.h"
-#include "fbsd-nat.h"
-#include "inf-ptrace.h"
 #include "target.h"
 
+#include <sys/types.h>
+#include <sys/ptrace.h>
+#include <machine/reg.h>
+
+#include "fbsd-nat.h"
+#include "arm-tdep.h"
+#include "arm-fbsd-tdep.h"
+#include "inf-ptrace.h"
+
 struct arm_fbsd_nat_target : public fbsd_nat_target
 {
   void fetch_registers (struct regcache *, int) override;

gdb/arm-fbsd-tdep.c

@@ -19,11 +19,10 @@
 
 #include "defs.h"
 
-/* Local non-gdb includes.  */
-#include "arm-fbsd-tdep.h"
-#include "arm-tdep.h"
-#include "auxv.h"
 #include "elf/common.h"
+#include "arm-tdep.h"
+#include "arm-fbsd-tdep.h"
+#include "auxv.h"
 #include "fbsd-tdep.h"
 #include "gdbcore.h"
 #include "osabi.h"

gdb/arm-linux-nat.c

@@ -17,29 +17,28 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Standard C includes.  */
-#include <elf/common.h>
-#include <sys/procfs.h>
-#include <sys/user.h>
-#include <sys/utsname.h>
-
-/* Local non-gdb includes.  */
-#include "aarch32-linux-nat.h"
-#include "arm-linux-tdep.h"
-#include "arm-tdep.h"
-#include "auxv.h"
-#include "gdbcore.h"
-#include "gdbthread.h"
 #include "inferior.h"
-#include "linux-nat.h"
+#include "gdbcore.h"
-#include "linux-tdep.h"
-#include "nat/gdb_ptrace.h"
-#include "nat/linux-ptrace.h"
-#include "observable.h"
 #include "regcache.h"
-#include "target-descriptions.h"
 #include "target.h"
+#include "linux-nat.h"
+#include "target-descriptions.h"
+#include "auxv.h"
+#include "observable.h"
+#include "gdbthread.h"
+
+#include "arm-tdep.h"
+#include "arm-linux-tdep.h"
+#include "aarch32-linux-nat.h"
+
+#include <elf/common.h>
+#include <sys/user.h>
+#include "nat/gdb_ptrace.h"
+#include <sys/utsname.h>
+#include <sys/procfs.h>
+
+#include "nat/linux-ptrace.h"
+#include "linux-tdep.h"
 
 /* Prototypes for supply_gregset etc.  */
 #include "gregset.h"

gdb/arm-linux-tdep.c

@@ -18,45 +18,43 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Standard C includes.  */
-#include <ctype.h>
-
-/* Local non-gdb includes.  */
-#include "arch-utils.h"
-#include "arch/arm-get-next-pcs.h"
-#include "arch/arm-linux.h"
-#include "arch/arm.h"
-#include "arm-linux-tdep.h"
-#include "arm-tdep.h"
-#include "auxv.h"
-#include "breakpoint.h"
-#include "cli/cli-utils.h"
-#include "elf/common.h"
-#include "frame.h"
-#include "gdbcore.h"
-#include "gdbthread.h"
-#include "gdbtypes.h"
-#include "glibc-tdep.h"
-#include "inferior.h"
-#include "infrun.h"
-#include "linux-record.h"
-#include "linux-tdep.h"
-#include "osabi.h"
-#include "parser-defs.h"
-#include "record-full.h"
-#include "regcache.h"
-#include "regset.h"
-#include "solib-svr4.h"
-#include "stap-probe.h"
-#include "symfile.h"
 #include "target.h"
+#include "value.h"
+#include "gdbtypes.h"
+#include "gdbcore.h"
+#include "frame.h"
+#include "regcache.h"
+#include "solib-svr4.h"
+#include "osabi.h"
+#include "regset.h"
 #include "trad-frame.h"
 #include "tramp-frame.h"
-#include "user-regs.h"
+#include "breakpoint.h"
-#include "value.h"
+#include "auxv.h"
 #include "xml-syscall.h"
 
+#include "arch/arm.h"
+#include "arch/arm-get-next-pcs.h"
+#include "arch/arm-linux.h"
+#include "arm-tdep.h"
+#include "arm-linux-tdep.h"
+#include "linux-tdep.h"
+#include "glibc-tdep.h"
+#include "arch-utils.h"
+#include "inferior.h"
+#include "infrun.h"
+#include "gdbthread.h"
+#include "symfile.h"
+
+#include "record-full.h"
+#include "linux-record.h"
+
+#include "cli/cli-utils.h"
+#include "stap-probe.h"
+#include "parser-defs.h"
+#include "user-regs.h"
+#include <ctype.h>
+#include "elf/common.h"
 extern int arm_apcs_32;
 
 /* Under ARM GNU/Linux the traditional way of performing a breakpoint

gdb/arm-nbsd-nat.c

@@ -18,20 +18,17 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Standard C includes.  */
-#include <machine/frame.h>
-#include <machine/reg.h>
-#include <sys/ptrace.h>
-#include <sys/types.h>
-
-/* Local non-gdb includes.  */
-#include "arm-tdep.h"
 #include "gdbcore.h"
-#include "inf-ptrace.h"
 #include "inferior.h"
 #include "regcache.h"
 #include "target.h"
+#include <sys/types.h>
+#include <sys/ptrace.h>
+#include <machine/reg.h>
+#include <machine/frame.h>
+
+#include "arm-tdep.h"
+#include "inf-ptrace.h"
 
 class arm_netbsd_nat_target final : public inf_ptrace_target
 {

gdb/arm-nbsd-tdep.c

@@ -18,11 +18,10 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
+#include "osabi.h"
 
-/* Local non-gdb includes.  */
 #include "arch/arm.h"
 #include "arm-tdep.h"
-#include "osabi.h"
 #include "solib-svr4.h"
 
 /* Description of the longjmp buffer.  */

gdb/arm-obsd-tdep.c

@@ -18,15 +18,14 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
-#include "arm-tdep.h"
-#include "obsd-tdep.h"
 #include "osabi.h"
-#include "solib-svr4.h"
 #include "trad-frame.h"
 #include "tramp-frame.h"
 
+#include "obsd-tdep.h"
+#include "arm-tdep.h"
+#include "solib-svr4.h"
+
 /* Signal trampolines.  */
 
 static void

gdb/arm-pikeos-tdep.c

@@ -16,10 +16,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
-#include "arm-tdep.h"
 #include "objfiles.h"
+#include "arm-tdep.h"
 #include "osabi.h"
 
 /* The gdbarch_register_osabi handler for ARM PikeOS; it performs

gdb/arm-symbian-tdep.c

@@ -18,15 +18,13 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
-#include "elf-bfd.h"
 #include "frame.h"
 #include "objfiles.h"
 #include "osabi.h"
-#include "solib-target.h"
 #include "solib.h"
+#include "solib-target.h"
 #include "target.h"
+#include "elf-bfd.h"
 
 /* If PC is in a DLL import stub, return the address of the `real'
    function belonging to the stub.  */

gdb/arm-tdep.c

@@ -19,54 +19,55 @@
 
 #include "defs.h"
 
-/* Standard C includes.  */
+#include <ctype.h>		/* XXX for isupper ().  */
-#include <ctype.h>
 
-/* Standard C++ includes.  */
-#include <algorithm>
-
-/* Local non-gdb includes.  */
-#include "arch-utils.h"
-#include "arch/arm-get-next-pcs.h"
-#include "arch/arm.h"
-#include "arm-tdep.h"
-#include "coff/internal.h"
-#include "common/vec.h"
-#include "dis-asm.h"
-#include "disasm.h"
-#include "dwarf2-frame.h"
-#include "elf-bfd.h"
-#include "elf/arm.h"
-#include "features/arm/arm-with-iwmmxt.c"
-#include "features/arm/arm-with-m-fpa-layout.c"
-#include "features/arm/arm-with-m-vfp-d16.c"
-#include "features/arm/arm-with-m.c"
-#include "features/arm/arm-with-neon.c"
-#include "features/arm/arm-with-vfpv2.c"
-#include "features/arm/arm-with-vfpv3.c"
-#include "frame-base.h"
-#include "frame-unwind.h"
 #include "frame.h"
-#include "gdb/sim-arm.h"
-#include "gdbcmd.h"
-#include "gdbcore.h"
-#include "gdbtypes.h"
 #include "inferior.h"
 #include "infrun.h"
-#include "objfiles.h"
+#include "gdbcmd.h"
-#include "observable.h"
+#include "gdbcore.h"
-#include "osabi.h"
+#include "dis-asm.h"		/* For register styles.  */
-#include "prologue-value.h"
+#include "disasm.h"
-#include "record-full.h"
-#include "record.h"
 #include "regcache.h"
 #include "reggroups.h"
+#include "target-float.h"
+#include "value.h"
+#include "arch-utils.h"
+#include "osabi.h"
+#include "frame-unwind.h"
+#include "frame-base.h"
+#include "trad-frame.h"
+#include "objfiles.h"
+#include "dwarf2-frame.h"
+#include "gdbtypes.h"
+#include "prologue-value.h"
 #include "remote.h"
 #include "target-descriptions.h"
-#include "target-float.h"
-#include "trad-frame.h"
 #include "user-regs.h"
-#include "value.h"
+#include "observable.h"
+
+#include "arch/arm.h"
+#include "arch/arm-get-next-pcs.h"
+#include "arm-tdep.h"
+#include "gdb/sim-arm.h"
+
+#include "elf-bfd.h"
+#include "coff/internal.h"
+#include "elf/arm.h"
+
+#include "common/vec.h"
+
+#include "record.h"
+#include "record-full.h"
+#include <algorithm>
+
+#include "features/arm/arm-with-m.c"
+#include "features/arm/arm-with-m-fpa-layout.c"
+#include "features/arm/arm-with-m-vfp-d16.c"
+#include "features/arm/arm-with-iwmmxt.c"
+#include "features/arm/arm-with-vfpv2.c"
+#include "features/arm/arm-with-vfpv3.c"
+#include "features/arm/arm-with-neon.c"
 
 #if GDB_SELF_TEST
 #include "common/selftest.h"

gdb/arm-wince-tdep.c

@@ -19,14 +19,13 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
+#include "osabi.h"
+#include "gdbcore.h"
+#include "target.h"
+#include "frame.h"
 
-/* Local non-gdb includes.  */
 #include "arch/arm.h"
 #include "arm-tdep.h"
-#include "frame.h"
-#include "gdbcore.h"
-#include "osabi.h"
-#include "target.h"
 #include "windows-tdep.h"
 
 static const gdb_byte arm_wince_le_breakpoint[] = { 0x10, 0x00, 0x00, 0xe6 };

gdb/auto-load.c

@@ -18,35 +18,29 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Standard C includes.  */
 #include <ctype.h>
-
-/* Standard C++ includes.  */
-#include <algorithm>
-
-/* Local non-gdb includes.  */
 #include "auto-load.h"
+#include "progspace.h"
+#include "gdb_regex.h"
+#include "ui-out.h"
+#include "filenames.h"
+#include "command.h"
+#include "observable.h"
+#include "objfiles.h"
+#include "cli/cli-script.h"
+#include "gdbcmd.h"
 #include "cli/cli-cmds.h"
 #include "cli/cli-decode.h"
-#include "cli/cli-script.h"
 #include "cli/cli-setshow.h"
-#include "command.h"
-#include "common/filestuff.h"
-#include "common/pathstuff.h"
-#include "completer.h"
-#include "extension.h"
-#include "filenames.h"
-#include "fnmatch.h"
-#include "gdb/section-scripts.h"
-#include "gdb_regex.h"
-#include "gdbcmd.h"
-#include "objfiles.h"
-#include "observable.h"
-#include "progspace.h"
 #include "readline/tilde.h"
+#include "completer.h"
+#include "fnmatch.h"
 #include "top.h"
-#include "ui-out.h"
+#include "common/filestuff.h"
+#include "extension.h"
+#include "gdb/section-scripts.h"
+#include <algorithm>
+#include "common/pathstuff.h"
 
 /* The section to look in for auto-loaded scripts (in file formats that
    support sections).

gdb/auxv.c

@@ -18,23 +18,21 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Standard C includes.  */
-#include <fcntl.h>
-#include <unistd.h>
-
-/* Local non-gdb includes.  */
-#include "auxv.h"
-#include "command.h"
-#include "common/filestuff.h"
-#include "elf/common.h"
-#include "gdbcore.h"
-#include "gdbtypes.h"
-#include "inferior.h"
-#include "objfiles.h"
-#include "observable.h"
 #include "target.h"
+#include "gdbtypes.h"
+#include "command.h"
+#include "inferior.h"
 #include "valprint.h"
+#include "gdbcore.h"
+#include "observable.h"
+#include "common/filestuff.h"
+#include "objfiles.h"
+
+#include "auxv.h"
+#include "elf/common.h"
+
+#include <unistd.h>
+#include <fcntl.h>
 
 
 /* Implement the to_xfer_partial target_ops method.  This function

gdb/avr-tdep.c

@@ -23,24 +23,20 @@
    by Denis Chertykov, denisc@overta.ru */
 
 #include "defs.h"
-
-/* Standard C++ includes.  */
-#include <algorithm>
-
-/* Local non-gdb includes.  */
-#include "arch-utils.h"
-#include "dis-asm.h"
-#include "frame-base.h"
-#include "frame-unwind.h"
 #include "frame.h"
+#include "frame-unwind.h"
+#include "frame-base.h"
+#include "trad-frame.h"
 #include "gdbcmd.h"
 #include "gdbcore.h"
 #include "gdbtypes.h"
 #include "inferior.h"
-#include "objfiles.h"
-#include "regcache.h"
 #include "symfile.h"
-#include "trad-frame.h"
+#include "arch-utils.h"
+#include "regcache.h"
+#include "dis-asm.h"
+#include "objfiles.h"
+#include <algorithm>
 
 /* AVR Background:
 

gdb/ax-gdb.c

@@ -18,36 +18,35 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
+#include "symtab.h"
-/* Local non-gdb includes.  */
+#include "symfile.h"
-#include "arch-utils.h"
-#include "ax-gdb.h"
-#include "ax.h"
-#include "block.h"
-#include "breakpoint.h"
-#include "c-lang.h"
-#include "cli/cli-utils.h"
-#include "command.h"
-#include "common/format.h"
-#include "cp-support.h"
-#include "dictionary.h"
-#include "expression.h"
-#include "frame.h"
-#include "gdbcmd.h"
 #include "gdbtypes.h"
 #include "language.h"
+#include "value.h"
+#include "expression.h"
+#include "command.h"
+#include "gdbcmd.h"
+#include "frame.h"
+#include "target.h"
+#include "ax.h"
+#include "ax-gdb.h"
+#include "block.h"
+#include "regcache.h"
+#include "user-regs.h"
+#include "dictionary.h"
+#include "breakpoint.h"
+#include "tracepoint.h"
+#include "cp-support.h"
+#include "arch-utils.h"
+#include "cli/cli-utils.h"
 #include "linespec.h"
 #include "location.h"
 #include "objfiles.h"
-#include "regcache.h"
-#include "symfile.h"
-#include "symtab.h"
-#include "target.h"
-#include "tracepoint.h"
 #include "typeprint.h"
-#include "user-regs.h"
 #include "valprint.h"
-#include "value.h"
+#include "c-lang.h"
+
+#include "common/format.h"
 
 /* To make sense of this file, you should read doc/agentexpr.texi.
    Then look at the types and enums in ax-gdb.h.  For the code itself,

gdb/ax-gdb.h

@@ -19,7 +19,7 @@
 #ifndef AX_GDB_H
 #define AX_GDB_H
 
-#include "ax.h"
+#include "ax.h"  /* For agent_expr_up.  */
 
 struct expression;
 union exp_element;

gdb/ax-general.c

@@ -22,11 +22,10 @@
    outside of GDB (test suites, the stub, etc.)  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
 #include "ax.h"
-#include "user-regs.h"
+
 #include "value.h"
+#include "user-regs.h"
 
 static void grow_expr (struct agent_expr *x, int n);
 

gdb/bcache.c

@@ -20,10 +20,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
-#include "bcache.h"
 #include "gdb_obstack.h"
+#include "bcache.h"
 
 /* The type used to hold a single bcache string.  The user data is
    stored in d.data.  Since it can be any type, it needs to have the

gdb/bfd-target.c

@@ -18,12 +18,10 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
+#include "target.h"
-/* Local non-gdb includes.  */
 #include "bfd-target.h"
 #include "exec.h"
 #include "gdb_bfd.h"
-#include "target.h"
 
 /* A target that wraps a BFD.  */
 

gdb/bfin-linux-tdep.c

@@ -20,16 +20,14 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
 #include "arch-utils.h"
-#include "bfin-tdep.h"
-#include "linux-tdep.h"
-#include "osabi.h"
 #include "regcache.h"
-#include "trad-frame.h"
 #include "tramp-frame.h"
+#include "trad-frame.h"
+#include "osabi.h"
 #include "xml-syscall.h"
+#include "linux-tdep.h"
+#include "bfin-tdep.h"
 
 /* From <asm/sigcontext.h>.  */
 

gdb/bfin-tdep.c

@@ -20,27 +20,25 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
+#include "inferior.h"
-/* Local non-gdb includes.  */
+#include "gdbcore.h"
 #include "arch-utils.h"
-#include "bfin-tdep.h"
+#include "regcache.h"
+#include "frame.h"
+#include "frame-unwind.h"
+#include "frame-base.h"
+#include "trad-frame.h"
 #include "dis-asm.h"
+#include "sim-regno.h"
+#include "gdb/sim-bfin.h"
 #include "dwarf2-frame.h"
+#include "symtab.h"
 #include "elf-bfd.h"
 #include "elf/bfin.h"
-#include "frame-base.h"
-#include "frame-unwind.h"
-#include "frame.h"
-#include "gdb/sim-bfin.h"
-#include "gdbcore.h"
-#include "infcall.h"
-#include "inferior.h"
 #include "osabi.h"
-#include "regcache.h"
+#include "infcall.h"
-#include "sim-regno.h"
-#include "symtab.h"
-#include "trad-frame.h"
 #include "xml-syscall.h"
+#include "bfin-tdep.h"
 
 /* Macros used by prologue functions.  */
 #define P_LINKAGE			0xE800

gdb/block.c

@@ -18,16 +18,14 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
-#include "addrmap.h"
 #include "block.h"
-#include "cp-support.h"
+#include "symtab.h"
+#include "symfile.h"
 #include "gdb_obstack.h"
+#include "cp-support.h"
+#include "addrmap.h"
 #include "gdbtypes.h"
 #include "objfiles.h"
-#include "symfile.h"
-#include "symtab.h"
 
 /* This is used by struct block to store namespace-related info for
    C++ files, namely using declarations and the current namespace in

gdb/blockframe.c

@@ -19,23 +19,21 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
-#include "annotate.h"
-#include "bfd.h"
-#include "block.h"
-#include "command.h"
-#include "dummy-frame.h"
-#include "frame.h"
-#include "gdbcmd.h"
-#include "gdbcore.h"
-#include "inferior.h"
-#include "inline-frame.h"
-#include "objfiles.h"
-#include "regcache.h"
 #include "symtab.h"
-#include "target.h"
+#include "bfd.h"
+#include "objfiles.h"
+#include "frame.h"
+#include "gdbcore.h"
 #include "value.h"
+#include "target.h"
+#include "inferior.h"
+#include "annotate.h"
+#include "regcache.h"
+#include "dummy-frame.h"
+#include "command.h"
+#include "gdbcmd.h"
+#include "block.h"
+#include "inline-frame.h"
 
 /* Return the innermost lexical block in execution in a specified
    stack frame.  The frame address is assumed valid.

gdb/break-catch-sig.c

@@ -18,23 +18,18 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Standard C includes.  */
-#include <ctype.h>
-
-/* Standard C++ includes.  */
-#include <string>
-
-/* Local non-gdb includes.  */
-#include "annotate.h"
 #include "arch-utils.h"
+#include <ctype.h>
 #include "breakpoint.h"
-#include "cli/cli-utils.h"
-#include "completer.h"
 #include "gdbcmd.h"
 #include "inferior.h"
 #include "infrun.h"
+#include "annotate.h"
 #include "valprint.h"
+#include "cli/cli-utils.h"
+#include "completer.h"
+
+#include <string>
 
 #define INTERNAL_SIGNAL(x) ((x) == GDB_SIGNAL_TRAP || (x) == GDB_SIGNAL_INT)
 

gdb/break-catch-syscall.c

@@ -18,20 +18,16 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Standard C includes.  */
 #include <ctype.h>
-
-/* Local non-gdb includes.  */
-#include "annotate.h"
-#include "arch-utils.h"
 #include "breakpoint.h"
-#include "cli/cli-utils.h"
 #include "gdbcmd.h"
 #include "inferior.h"
+#include "cli/cli-utils.h"
+#include "annotate.h"
 #include "mi/mi-common.h"
-#include "observable.h"
 #include "valprint.h"
+#include "arch-utils.h"
+#include "observable.h"
 #include "xml-syscall.h"
 
 /* An instance of this type is used to represent a syscall catchpoint.

gdb/break-catch-throw.c

@@ -18,28 +18,24 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Standard C includes.  */
-#include <ctype.h>
-
-/* Local non-gdb includes.  */
-#include "annotate.h"
 #include "arch-utils.h"
+#include <ctype.h>
 #include "breakpoint.h"
-#include "cli/cli-utils.h"
-#include "completer.h"
-#include "cp-abi.h"
-#include "cp-support.h"
-#include "gdb_obstack.h"
-#include "gdb_regex.h"
 #include "gdbcmd.h"
 #include "inferior.h"
-#include "linespec.h"
+#include "annotate.h"
-#include "location.h"
-#include "mi/mi-common.h"
-#include "objfiles.h"
-#include "probe.h"
 #include "valprint.h"
+#include "cli/cli-utils.h"
+#include "completer.h"
+#include "gdb_obstack.h"
+#include "mi/mi-common.h"
+#include "linespec.h"
+#include "probe.h"
+#include "objfiles.h"
+#include "cp-abi.h"
+#include "gdb_regex.h"
+#include "cp-support.h"
+#include "location.h"
 
 /* Enums for exception-handling support.  */
 enum exception_event_kind

gdb/breakpoint.c

@@ -18,62 +18,58 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Standard C includes.  */
-#include <ctype.h>
-
-/* Local non-gdb includes.  */
-#include "ada-lang.h"
-#include "annotate.h"
 #include "arch-utils.h"
-#include "ax-gdb.h"
+#include <ctype.h>
-#include "block.h"
-#include "breakpoint.h"
-#include "cli/cli-script.h"
-#include "cli/cli-style.h"
-#include "cli/cli-utils.h"
-#include "command.h"
-#include "common/format.h"
-#include "completer.h"
-#include "continuations.h"
-#include "dummy-frame.h"
-#include "expression.h"
-#include "filenames.h"
-#include "frame.h"
-#include "gdb-demangle.h"
-#include "gdb_regex.h"
-#include "gdbcmd.h"
-#include "gdbcore.h"
-#include "gdbthread.h"
-#include "gdbtypes.h"
 #include "hashtab.h"
+#include "symtab.h"
+#include "frame.h"
+#include "breakpoint.h"
+#include "tracepoint.h"
+#include "gdbtypes.h"
+#include "expression.h"
+#include "gdbcore.h"
+#include "gdbcmd.h"
+#include "value.h"
+#include "command.h"
 #include "inferior.h"
 #include "infrun.h"
-#include "interps.h"
+#include "gdbthread.h"
-#include "jit.h"
+#include "target.h"
 #include "language.h"
-#include "linespec.h"
+#include "gdb-demangle.h"
-#include "memattr.h"
+#include "filenames.h"
-#include "mi/mi-main.h"
+#include "annotate.h"
+#include "symfile.h"
 #include "objfiles.h"
-#include "observable.h"
+#include "source.h"
-#include "parser-defs.h"
+#include "linespec.h"
-#include "probe.h"
+#include "completer.h"
-#include "skip.h"
+#include "ui-out.h"
+#include "cli/cli-script.h"
+#include "block.h"
 #include "solib.h"
 #include "solist.h"
-#include "source.h"
+#include "observable.h"
+#include "memattr.h"
+#include "ada-lang.h"
+#include "top.h"
+#include "valprint.h"
+#include "jit.h"
+#include "parser-defs.h"
+#include "gdb_regex.h"
+#include "probe.h"
+#include "cli/cli-utils.h"
+#include "continuations.h"
 #include "stack.h"
-#include "symfile.h"
+#include "skip.h"
-#include "symtab.h"
+#include "ax-gdb.h"
-#include "target.h"
+#include "dummy-frame.h"
+#include "interps.h"
+#include "common/format.h"
 #include "thread-fsm.h"
 #include "tid-parse.h"
-#include "top.h"
+#include "cli/cli-style.h"
-#include "tracepoint.h"
+#include "mi/mi-main.h"
-#include "ui-out.h"
-#include "valprint.h"
-#include "value.h"
 
 /* readline include files */
 #include "readline/readline.h"

gdb/breakpoint.h

@@ -19,19 +19,17 @@
 #if !defined (BREAKPOINT_H)
 #define BREAKPOINT_H 1
 
-#include <vector>
-
-/* Local non-gdb includes.  */
-#include "ax.h"
-#include "cli/cli-script.h"
-#include "command.h"
-#include "common/array-view.h"
-#include "common/break-common.h"
-#include "common/vec.h"
 #include "frame.h"
-#include "location.h"
-#include "probe.h"
 #include "value.h"
+#include "common/vec.h"
+#include "ax.h"
+#include "command.h"
+#include "common/break-common.h"
+#include "probe.h"
+#include "location.h"
+#include <vector>
+#include "common/array-view.h"
+#include "cli/cli-script.h"
 
 struct block;
 struct gdbpy_breakpoint_object;

gdb/bsd-uthread.c

@@ -18,10 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
-#include "bsd-uthread.h"
-#include "gdb_obstack.h"
 #include "gdbcore.h"
 #include "gdbthread.h"
 #include "inferior.h"
@@ -33,6 +29,10 @@
 #include "symfile.h"
 #include "target.h"
 
+#include "gdb_obstack.h"
+
+#include "bsd-uthread.h"
+
 static const target_info bsd_uthread_target_info = {
   "bsd-uthreads",
   N_("BSD user-level threads"),

gdb/btrace.c

@@ -20,22 +20,20 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
 #include "btrace.h"
-#include "cli/cli-utils.h"
-#include "common/rsp-low.h"
-#include "disasm.h"
-#include "filenames.h"
-#include "gdbcmd.h"
 #include "gdbthread.h"
 #include "inferior.h"
-#include "record.h"
-#include "regcache.h"
-#include "source.h"
-#include "symtab.h"
 #include "target.h"
+#include "record.h"
+#include "symtab.h"
+#include "disasm.h"
+#include "source.h"
+#include "filenames.h"
 #include "xml-support.h"
+#include "regcache.h"
+#include "common/rsp-low.h"
+#include "gdbcmd.h"
+#include "cli/cli-utils.h"
 
 /* For maintenance commands.  */
 #include "record-btrace.h"

gdb/build-id.c

@@ -18,16 +18,14 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
 #include "bfd.h"
+#include "gdb_bfd.h"
 #include "build-id.h"
 #include "common/gdb_vecs.h"
-#include "filenames.h"
-#include "gdb_bfd.h"
-#include "gdbcore.h"
-#include "objfiles.h"
 #include "symfile.h"
+#include "objfiles.h"
+#include "filenames.h"
+#include "gdbcore.h"
 
 /* See build-id.h.  */
 

gdb/build-id.h

@@ -20,8 +20,8 @@
 #ifndef BUILD_ID_H
 #define BUILD_ID_H
 
-#include "common/rsp-low.h"
 #include "gdb_bfd.h"
+#include "common/rsp-low.h"
 
 /* Locate NT_GNU_BUILD_ID from ABFD and return its content.  */
 

gdb/buildsym-legacy.c

@@ -17,8 +17,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
 #include "buildsym-legacy.h"
 
 /* The work-in-progress of the compunit we are building.

gdb/buildsym.c

@@ -17,27 +17,23 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Standard C++ includes.  */
-#include <algorithm>
-
-/* Local non-gdb includes.  */
-#include "addrmap.h"
-#include "bfd.h"
-#include "block.h"
 #include "buildsym-legacy.h"
-#include "complaints.h"
+#include "bfd.h"
-#include "cp-support.h"
-#include "demangle.h"
-#include "dictionary.h"
-#include "expression.h"
-#include "filenames.h"
 #include "gdb_obstack.h"
-#include "gdbtypes.h"
-#include "macrotab.h"
-#include "objfiles.h"
-#include "symfile.h"
 #include "symtab.h"
+#include "symfile.h"
+#include "objfiles.h"
+#include "gdbtypes.h"
+#include "complaints.h"
+#include "expression.h"		/* For "enum exp_opcode" used by...  */
+#include "filenames.h"		/* For DOSish file names.  */
+#include "macrotab.h"
+#include "demangle.h"		/* Needed by SYMBOL_INIT_DEMANGLED_NAME.  */
+#include "block.h"
+#include "cp-support.h"
+#include "dictionary.h"
+#include "addrmap.h"
+#include <algorithm>
 
 /* For cleanup_undefined_stabs_types and finish_global_stabs (somewhat
    questionable--see comment where we call them).  */

gdb/c-lang.c

@@ -18,27 +18,23 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
+#include "symtab.h"
-/* Standard C includes.  */
+#include "gdbtypes.h"
-#include <ctype.h>
+#include "expression.h"
-
+#include "parser-defs.h"
-/* Local non-gdb includes.  */
+#include "language.h"
+#include "varobj.h"
 #include "c-lang.h"
 #include "c-support.h"
+#include "valprint.h"
+#include "macroscope.h"
 #include "charset.h"
+#include "demangle.h"
 #include "cp-abi.h"
 #include "cp-support.h"
-#include "demangle.h"
-#include "expression.h"
 #include "gdb_obstack.h"
+#include <ctype.h>
 #include "gdbcore.h"
-#include "gdbtypes.h"
-#include "language.h"
-#include "macroscope.h"
-#include "parser-defs.h"
-#include "symtab.h"
-#include "valprint.h"
-#include "varobj.h"
 
 /* Given a C string type, STR_TYPE, return the corresponding target
    character set name.  */

gdb/c-typeprint.c

@@ -17,23 +17,21 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
+#include "gdb_obstack.h"
-/* Local non-gdb includes.  */
+#include "bfd.h"		/* Binary File Description.  */
-#include "bfd.h"
+#include "symtab.h"
+#include "gdbtypes.h"
+#include "expression.h"
+#include "value.h"
+#include "gdbcore.h"
+#include "target.h"
+#include "language.h"
+#include "demangle.h"
 #include "c-lang.h"
 #include "cli/cli-style.h"
+#include "typeprint.h"
 #include "cp-abi.h"
 #include "cp-support.h"
-#include "demangle.h"
-#include "expression.h"
-#include "gdb_obstack.h"
-#include "gdbcore.h"
-#include "gdbtypes.h"
-#include "language.h"
-#include "symtab.h"
-#include "target.h"
-#include "typeprint.h"
-#include "value.h"
 
 /* A list of access specifiers used for printing.  */
 

gdb/c-valprint.c

@@ -18,19 +18,16 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
+#include "symtab.h"
-/* Local non-gdb includes.  */
+#include "gdbtypes.h"
+#include "expression.h"
+#include "value.h"
+#include "valprint.h"
+#include "language.h"
 #include "c-lang.h"
 #include "cp-abi.h"
-#include "expression.h"
-#include "gdbtypes.h"
-#include "language.h"
-#include "objfiles.h"
-#include "symtab.h"
 #include "target.h"
-#include "valprint.h"
+#include "objfiles.h"
-#include "value.h"
-
 
 
 /* A helper for c_textual_element_type.  This checks the name of the

gdb/c-varobj.c

@@ -16,12 +16,10 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
-#include "gdbthread.h"
-#include "valprint.h"
 #include "value.h"
 #include "varobj.h"
+#include "gdbthread.h"
+#include "valprint.h"
 
 static void cplus_class_num_children (struct type *type, int children[3]);
 

gdb/charset.c

@@ -18,20 +18,16 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Standard C includes.  */
-#include <ctype.h>
-
-/* Local non-gdb includes.  */
-#include "arch-utils.h"
-#include "charset-list.h"
 #include "charset.h"
-#include "common/environ.h"
-#include "common/gdb_vecs.h"
-#include "common/gdb_wait.h"
-#include "common/vec.h"
-#include "gdb_obstack.h"
 #include "gdbcmd.h"
+#include "gdb_obstack.h"
+#include "common/gdb_wait.h"
+#include "charset-list.h"
+#include "common/vec.h"
+#include "common/environ.h"
+#include "arch-utils.h"
+#include "common/gdb_vecs.h"
+#include <ctype.h>
 
 #ifdef USE_WIN32API
 #include <windows.h>

gdb/cli-out.c

@@ -21,13 +21,11 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
+#include "ui-out.h"
-/* Local non-gdb includes.  */
 #include "cli-out.h"
-#include "cli/cli-style.h"
 #include "completer.h"
 #include "readline/readline.h"
-#include "ui-out.h"
+#include "cli/cli-style.h"
 
 /* These are the CLI output functions */
 

gdb/cli-out.h

@@ -20,10 +20,8 @@
 #ifndef CLI_OUT_H
 #define CLI_OUT_H
 
-#include <vector>
-
-/* Local non-gdb includes.  */
 #include "ui-out.h"
+#include <vector>
 
 class cli_ui_out : public ui_out
 {

gdb/coff-pe-read.c

@@ -23,20 +23,20 @@
 
 #include "defs.h"
 
-/* Standard C includes.  */
-#include <ctype.h>
-
-/* Local non-gdb includes.  */
-#include "bfd.h"
 #include "coff-pe-read.h"
-#include "coff/internal.h"
+
-#include "command.h"
+#include "bfd.h"
-#include "common/common-utils.h"
-#include "gdbcmd.h"
 #include "gdbtypes.h"
-#include "objfiles.h"
+
-#include "symfile.h"
+#include "command.h"
+#include "gdbcmd.h"
 #include "symtab.h"
+#include "symfile.h"
+#include "objfiles.h"
+#include "common/common-utils.h"
+#include "coff/internal.h"
+
+#include <ctype.h>
 
 /* Internal section information */
 

gdb/coffread.c

@@ -18,30 +18,30 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
+#include "symtab.h"
+#include "gdbtypes.h"
+#include "demangle.h"
+#include "breakpoint.h"
 
-/* Standard C includes.  */
+#include "bfd.h"
+#include "gdb_obstack.h"
 #include <ctype.h>
 
-/* Local non-gdb includes.  */
+#include "coff/internal.h"	/* Internal format of COFF symbols in BFD */
-#include "bfd.h"
+#include "libcoff.h"		/* FIXME secret internal data from BFD */
-#include "block.h"
-#include "breakpoint.h"
-#include "build-id.h"
-#include "buildsym-legacy.h"
-#include "coff-pe-read.h"
-#include "coff/internal.h"
-#include "complaints.h"
-#include "demangle.h"
-#include "dictionary.h"
-#include "gdb-stabs.h"
-#include "gdb_obstack.h"
-#include "gdbtypes.h"
-#include "libcoff.h"
 #include "objfiles.h"
-#include "psymtab.h"
+#include "buildsym-legacy.h"
+#include "gdb-stabs.h"
 #include "stabsread.h"
-#include "symtab.h"
+#include "complaints.h"
 #include "target.h"
+#include "block.h"
+#include "dictionary.h"
+
+#include "coff-pe-read.h"
+
+#include "psymtab.h"
+#include "build-id.h"
 
 /* Key for COFF-associated data.  */
 

gdb/complaints.c

@@ -18,14 +18,10 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Standard C++ includes.  */
-#include <unordered_map>
-
-/* Local non-gdb includes.  */
-#include "command.h"
 #include "complaints.h"
+#include "command.h"
 #include "gdbcmd.h"
+#include <unordered_map>
 
 /* Map format strings to counters.  */
 

gdb/completer.c

@@ -17,24 +17,20 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Standard C++ includes.  */
-#include <algorithm>
-
-/* Local non-gdb includes.  */
-#include "arch-utils.h"
-#include "cli/cli-decode.h"
-#include "common/gdb_signals.h"
-#include "expression.h"
-#include "filenames.h"
-#include "gdbtypes.h"
-#include "language.h"
-#include "linespec.h"
-#include "location.h"
-#include "reggroups.h"
 #include "symtab.h"
+#include "gdbtypes.h"
+#include "expression.h"
+#include "filenames.h"		/* For DOSish file names.  */
+#include "language.h"
+#include "common/gdb_signals.h"
 #include "target.h"
+#include "reggroups.h"
 #include "user-regs.h"
+#include "arch-utils.h"
+#include "location.h"
+#include <algorithm>
+#include "linespec.h"
+#include "cli/cli-decode.h"
 
 /* FIXME: This is needed because of lookup_cmd_1 ().  We should be
    calling a hook instead so we eliminate the CLI dependency.  */

gdb/completer.h

@@ -17,8 +17,8 @@
 #if !defined (COMPLETER_H)
 #define COMPLETER_H 1
 
-#include "command.h"
 #include "common/gdb_vecs.h"
+#include "command.h"
 
 /* Types of functions in struct match_list_displayer.  */
 

gdb/continuations.c

@@ -18,11 +18,9 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
-#include "continuations.h"
 #include "gdbthread.h"
 #include "inferior.h"
+#include "continuations.h"
 
 struct continuation
 {

gdb/corefile.c

@@ -18,24 +18,20 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Standard C includes.  */
-#include <fcntl.h>
 #include <signal.h>
-#include <sys/stat.h>
+#include <fcntl.h>
-
-/* Local non-gdb includes.  */
-#include "bfd.h"
-#include "cli/cli-utils.h"
-#include "command.h"
-#include "completer.h"
-#include "dis-asm.h"
-#include "gdbcmd.h"
-#include "gdbcore.h"
 #include "inferior.h"
-#include "observable.h"
 #include "symtab.h"
+#include "command.h"
+#include "gdbcmd.h"
+#include "bfd.h"
 #include "target.h"
+#include "gdbcore.h"
+#include "dis-asm.h"
+#include <sys/stat.h>
+#include "completer.h"
+#include "observable.h"
+#include "cli/cli-utils.h"
 
 /* You can have any number of hooks for `exec_file_command' command to
    call.  If there's only one hook, it is set in exec_file_display

gdb/corelow.c

@@ -18,35 +18,31 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Standard C includes.  */
-#include <fcntl.h>
-#include <signal.h>
-
-/* Local non-gdb includes.  */
 #include "arch-utils.h"
-#include "bfd.h"
+#include <signal.h>
-#include "command.h"
+#include <fcntl.h>
-#include "common/filestuff.h"
+#include "frame.h"		/* required by inferior.h */
-#include "completer.h"
-#include "exec.h"
-#include "filenames.h"
-#include "frame.h"
-#include "gdb_bfd.h"
-#include "gdbcore.h"
-#include "gdbthread.h"
 #include "inferior.h"
 #include "infrun.h"
-#include "objfiles.h"
+#include "symtab.h"
+#include "command.h"
+#include "bfd.h"
+#include "target.h"
 #include "process-stratum-target.h"
-#include "progspace.h"
+#include "gdbcore.h"
-#include "readline/readline.h"
+#include "gdbthread.h"
 #include "regcache.h"
 #include "regset.h"
-#include "solib.h"
 #include "symfile.h"
-#include "symtab.h"
+#include "exec.h"
-#include "target.h"
+#include "readline/readline.h"
+#include "solib.h"
+#include "filenames.h"
+#include "progspace.h"
+#include "objfiles.h"
+#include "gdb_bfd.h"
+#include "completer.h"
+#include "common/filestuff.h"
 
 #ifndef O_LARGEFILE
 #define O_LARGEFILE 0

gdb/cp-abi.c

@@ -18,14 +18,11 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
+#include "value.h"
-/* Local non-gdb includes.  */
-#include "command.h"
 #include "cp-abi.h"
+#include "command.h"
 #include "gdbcmd.h"
 #include "ui-out.h"
-#include "value.h"
-
 static struct cp_abi_ops *find_cp_abi (const char *short_name);
 
 static struct cp_abi_ops current_cp_abi = { "", NULL };

gdb/cp-namespace.c

@@ -19,24 +19,20 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Standard C++ includes.  */
-#include <string>
-
-/* Local non-gdb includes.  */
-#include "block.h"
-#include "buildsym.h"
-#include "command.h"
 #include "cp-support.h"
-#include "dictionary.h"
-#include "frame.h"
 #include "gdb_obstack.h"
+#include "symtab.h"
+#include "symfile.h"
+#include "block.h"
+#include "objfiles.h"
 #include "gdbtypes.h"
+#include "dictionary.h"
+#include "command.h"
+#include "frame.h"
+#include "buildsym.h"
 #include "language.h"
 #include "namespace.h"
-#include "objfiles.h"
+#include <string>
-#include "symfile.h"
-#include "symtab.h"
 
 static struct block_symbol
   cp_lookup_nested_symbol_1 (struct type *container_type,

gdb/cp-support.c

@@ -19,28 +19,24 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Standard C includes.  */
-#include <signal.h>
-
-/* Local non-gdb includes.  */
-#include "block.h"
-#include "common/gdb_setjmp.h"
-#include "common/selftest.h"
-#include "complaints.h"
-#include "cp-abi.h"
 #include "cp-support.h"
 #include "demangle.h"
-#include "dictionary.h"
-#include "expression.h"
-#include "frame.h"
 #include "gdbcmd.h"
-#include "gdbtypes.h"
+#include "dictionary.h"
-#include "namespace.h"
 #include "objfiles.h"
-#include "safe-ctype.h"
+#include "frame.h"
 #include "symtab.h"
+#include "block.h"
+#include "complaints.h"
+#include "gdbtypes.h"
+#include "expression.h"
 #include "value.h"
+#include "cp-abi.h"
+#include "namespace.h"
+#include <signal.h>
+#include "common/gdb_setjmp.h"
+#include "safe-ctype.h"
+#include "common/selftest.h"
 
 #define d_left(dc) (dc)->u.s_binary.left
 #define d_right(dc) (dc)->u.s_binary.right

gdb/cp-valprint.c

@@ -18,26 +18,24 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
+#include "gdb_obstack.h"
-/* Local non-gdb includes.  */
+#include "symtab.h"
+#include "gdbtypes.h"
+#include "expression.h"
+#include "value.h"
+#include "command.h"
+#include "gdbcmd.h"
+#include "demangle.h"
 #include "annotate.h"
 #include "c-lang.h"
-#include "command.h"
-#include "common/byte-vector.h"
-#include "cp-abi.h"
-#include "cp-support.h"
-#include "demangle.h"
-#include "expression.h"
-#include "extension.h"
-#include "gdb_obstack.h"
-#include "gdbcmd.h"
-#include "gdbtypes.h"
-#include "language.h"
-#include "symtab.h"
 #include "target.h"
-#include "typeprint.h"
+#include "cp-abi.h"
 #include "valprint.h"
-#include "value.h"
+#include "cp-support.h"
+#include "language.h"
+#include "extension.h"
+#include "typeprint.h"
+#include "common/byte-vector.h"
 
 /* Controls printing of vtbl's.  */
 static void