[binutils-gdb] Revert the header-sorting patch
Tom Tromey
tromey@sourceware.org
Sat Apr 6 19:49:00 GMT 2019
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=4de283e4b5f21207fe12f99913d1f28d4f07843c
commit 4de283e4b5f21207fe12f99913d1f28d4f07843c
Author: Tom Tromey <tom@tromey.com>
Date: Sat Apr 6 13:38:10 2019 -0600
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.
Diff:
---
gdb/ChangeLog | 165 +++++++++++++++++++++++++++++++++++++++++
gdb/aarch32-linux-nat.c | 10 +--
gdb/aarch64-fbsd-nat.c | 12 ++-
gdb/aarch64-fbsd-tdep.c | 9 +--
gdb/aarch64-linux-nat.c | 36 ++++-----
gdb/aarch64-linux-tdep.c | 36 ++++-----
gdb/aarch64-newlib-tdep.c | 3 +-
gdb/aarch64-ravenscar-thread.c | 8 +-
gdb/aarch64-tdep.c | 64 ++++++++--------
gdb/ada-lang.c | 71 +++++++++---------
gdb/ada-tasks.c | 12 ++-
gdb/ada-typeprint.c | 32 ++++----
gdb/ada-valprint.c | 20 ++---
gdb/ada-varobj.c | 4 +-
gdb/addrmap.c | 6 +-
gdb/agent.c | 4 +-
gdb/aix-thread.c | 25 +++----
gdb/alpha-bsd-nat.c | 19 +++--
gdb/alpha-bsd-tdep.c | 5 +-
gdb/alpha-linux-nat.c | 15 ++--
gdb/alpha-linux-tdep.c | 10 +--
gdb/alpha-mdebug-tdep.c | 15 ++--
gdb/alpha-nbsd-tdep.c | 11 ++-
gdb/alpha-obsd-tdep.c | 9 +--
gdb/alpha-tdep.c | 38 +++++-----
gdb/amd64-bsd-nat.c | 2 -
gdb/amd64-darwin-tdep.c | 27 ++++---
gdb/amd64-dicos-tdep.c | 4 +-
gdb/amd64-fbsd-nat.c | 21 +++---
gdb/amd64-fbsd-tdep.c | 13 ++--
gdb/amd64-linux-nat.c | 26 +++----
gdb/amd64-linux-tdep.c | 29 ++++----
gdb/amd64-nat.c | 9 +--
gdb/amd64-nbsd-nat.c | 7 +-
gdb/amd64-nbsd-tdep.c | 11 ++-
gdb/amd64-obsd-nat.c | 9 +--
gdb/amd64-obsd-tdep.c | 19 +++--
gdb/amd64-sol2-tdep.c | 11 ++-
gdb/amd64-tdep.c | 36 ++++-----
gdb/amd64-windows-nat.c | 9 +--
gdb/amd64-windows-tdep.c | 26 +++----
gdb/annotate.c | 11 +--
gdb/annotate.h | 2 +-
gdb/arc-newlib-tdep.c | 3 +-
gdb/arc-tdep.c | 4 +-
gdb/arch-utils.c | 22 +++---
gdb/arm-bsd-tdep.c | 5 +-
gdb/arm-fbsd-nat.c | 12 ++-
gdb/arm-fbsd-tdep.c | 5 +-
gdb/arm-linux-nat.c | 33 ++++-----
gdb/arm-linux-tdep.c | 56 +++++++-------
gdb/arm-nbsd-nat.c | 17 ++---
gdb/arm-nbsd-tdep.c | 3 +-
gdb/arm-obsd-tdep.c | 9 +--
gdb/arm-pikeos-tdep.c | 4 +-
gdb/arm-symbian-tdep.c | 6 +-
gdb/arm-tdep.c | 77 +++++++++----------
gdb/arm-wince-tdep.c | 9 +--
gdb/auto-load.c | 36 ++++-----
gdb/auxv.c | 26 +++----
gdb/avr-tdep.c | 20 ++---
gdb/ax-gdb.c | 41 +++++-----
gdb/ax-gdb.h | 2 +-
gdb/ax-general.c | 5 +-
gdb/bcache.c | 4 +-
gdb/bfd-target.c | 4 +-
gdb/bfin-linux-tdep.c | 10 +--
gdb/bfin-tdep.c | 26 +++----
gdb/block.c | 10 +--
gdb/blockframe.c | 22 +++---
gdb/break-catch-sig.c | 17 ++---
gdb/break-catch-syscall.c | 12 +--
gdb/break-catch-throw.c | 26 +++----
gdb/breakpoint.c | 80 ++++++++++----------
gdb/breakpoint.h | 16 ++--
gdb/bsd-uthread.c | 8 +-
gdb/btrace.c | 18 ++---
gdb/build-id.c | 8 +-
gdb/build-id.h | 2 +-
gdb/buildsym-legacy.c | 2 -
gdb/buildsym.c | 30 ++++----
gdb/c-lang.c | 24 +++---
gdb/c-typeprint.c | 24 +++---
gdb/c-valprint.c | 17 ++---
gdb/c-varobj.c | 6 +-
gdb/charset.c | 18 ++---
gdb/cli-out.c | 6 +-
gdb/cli-out.h | 4 +-
gdb/coff-pe-read.c | 18 ++---
gdb/coffread.c | 34 ++++-----
gdb/complaints.c | 8 +-
gdb/completer.c | 24 +++---
gdb/completer.h | 2 +-
gdb/continuations.c | 4 +-
gdb/corefile.c | 22 +++---
gdb/corelow.c | 40 +++++-----
gdb/cp-abi.c | 7 +-
gdb/cp-namespace.c | 22 +++---
gdb/cp-support.c | 26 +++----
gdb/cp-valprint.c | 26 +++----
gdb/cris-linux-tdep.c | 7 +-
gdb/cris-tdep.c | 35 ++++-----
gdb/csky-linux-tdep.c | 10 +--
gdb/csky-tdep.c | 56 +++++++-------
gdb/ctf.c | 22 ++----
gdb/d-lang.c | 12 ++-
gdb/d-namespace.c | 8 +-
gdb/d-valprint.c | 8 +-
gdb/darwin-nat-info.c | 29 ++++----
gdb/darwin-nat.c | 71 +++++++++---------
gdb/darwin-nat.h | 4 +-
gdb/dcache.c | 4 +-
gdb/dcache.h | 2 +-
gdb/demangle.c | 6 +-
gdb/dicos-tdep.c | 8 +-
gdb/dictionary.c | 12 +--
gdb/disasm-selftests.c | 2 -
gdb/disasm.c | 20 ++---
gdb/disasm.h | 2 +-
gdb/dtrace-probe.c | 18 ++---
gdb/dummy-frame.c | 12 ++-
gdb/dwarf-index-cache.c | 15 ++--
gdb/dwarf-index-cache.h | 2 +-
gdb/dwarf-index-common.c | 2 -
gdb/dwarf-index-write.c | 14 ++--
gdb/dwarf-index-write.h | 2 +-
gdb/dwarf2-frame-tailcall.c | 10 +--
gdb/dwarf2-frame.c | 22 +++---
gdb/dwarf2expr.c | 12 ++-
gdb/dwarf2expr.h | 2 +-
gdb/dwarf2loc.c | 40 +++++-----
gdb/dwarf2read.c | 108 +++++++++++++--------------
gdb/dwarf2read.h | 2 -
gdb/elfread.c | 36 +++++----
gdb/eval.c | 32 ++++----
gdb/event-loop.c | 4 +-
gdb/event-top.c | 32 ++++----
gdb/exceptions.c | 14 ++--
gdb/exec.c | 44 +++++------
gdb/exec.h | 4 +-
gdb/expprint.c | 19 ++---
gdb/extension-priv.h | 4 +-
gdb/extension.c | 12 +--
gdb/extension.h | 4 +-
gdb/f-lang.c | 27 +++----
gdb/f-typeprint.c | 12 ++-
gdb/f-valprint.c | 18 ++---
gdb/fbsd-nat.c | 36 ++++-----
gdb/fbsd-nat.h | 4 +-
gdb/fbsd-tdep.c | 17 ++---
gdb/filename-seen-cache.c | 2 -
gdb/filename-seen-cache.h | 2 +-
gdb/filesystem.c | 2 -
gdb/findcmd.c | 16 ++--
gdb/findvar.c | 22 +++---
gdb/fork-child.c | 14 ++--
gdb/frame-base.c | 2 -
gdb/frame-unwind.c | 10 +--
gdb/frame.c | 36 +++++----
gdb/frv-linux-tdep.c | 18 ++---
gdb/frv-tdep.c | 30 ++++----
gdb/ft32-tdep.c | 34 ++++-----
162 files changed, 1426 insertions(+), 1593 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cad57a4..7d79c81 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,170 @@
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.
* frv-tdep.c: Sort headers.
* frv-linux-tdep.c: Sort headers.
diff --git a/gdb/aarch32-linux-nat.c b/gdb/aarch32-linux-nat.c
index 6471626..e23dbb1 100644
--- a/gdb/aarch32-linux-nat.c
+++ b/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. */
diff --git a/gdb/aarch64-fbsd-nat.c b/gdb/aarch64-fbsd-nat.c
index cb4130a..bb187a6 100644
--- a/gdb/aarch64-fbsd-nat.c
+++ b/gdb/aarch64-fbsd-nat.c
@@ -18,18 +18,16 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
+#include "target.h"
-/* Standard C includes. */
-#include <machine/reg.h>
-#include <sys/ptrace.h>
#include <sys/types.h>
+#include <sys/ptrace.h>
+#include <machine/reg.h>
-/* Local non-gdb includes. */
-#include "aarch64-fbsd-tdep.h"
-#include "aarch64-tdep.h"
#include "fbsd-nat.h"
+#include "aarch64-tdep.h"
+#include "aarch64-fbsd-tdep.h"
#include "inf-ptrace.h"
-#include "target.h"
struct aarch64_fbsd_nat_target final : public fbsd_nat_target
{
diff --git a/gdb/aarch64-fbsd-tdep.c b/gdb/aarch64-fbsd-tdep.c
index 63850ab..c611ff3 100644
--- a/gdb/aarch64-fbsd-tdep.c
+++ b/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. */
diff --git a/gdb/aarch64-linux-nat.c b/gdb/aarch64-linux-nat.c
index b9e6880..6d43eb7 100644
--- a/gdb/aarch64-linux-nat.c
+++ b/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 "gdbcore.h"
+#include "regcache.h"
#include "linux-nat.h"
-#include "linux-tdep.h"
-#include "nat/aarch64-linux-hw-point.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 "regcache.h"
-#include "target-descriptions.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"
diff --git a/gdb/aarch64-linux-tdep.c b/gdb/aarch64-linux-tdep.c
index 5a126b0..7f2193f 100644
--- a/gdb/aarch64-linux-tdep.c
+++ b/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 "record-full.h"
-#include "regcache.h"
-#include "regset.h"
#include "solib-svr4.h"
-#include "stap-probe.h"
#include "symtab.h"
-#include "trad-frame.h"
#include "tramp-frame.h"
+#include "trad-frame.h"
+
+#include "inferior.h"
+#include "regcache.h"
+#include "regset.h"
+
+#include "cli/cli-utils.h"
+#include "stap-probe.h"
+#include "parser-defs.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.
diff --git a/gdb/aarch64-newlib-tdep.c b/gdb/aarch64-newlib-tdep.c
index 3c1c898..131f099 100644
--- a/gdb/aarch64-newlib-tdep.c
+++ b/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. */
diff --git a/gdb/aarch64-ravenscar-thread.c b/gdb/aarch64-ravenscar-thread.c
index b6709fc..3e87a4b 100644
--- a/gdb/aarch64-ravenscar-thread.c
+++ b/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
diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c
index ca0d002..68b6549 100644
--- a/gdb/aarch64-tdep.c
+++ b/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 "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 "dis-asm.h"
#include "regcache.h"
#include "reggroups.h"
-#include "target-descriptions.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 "value.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)
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 10ae7cb..51615dc 100644
--- a/gdb/ada-lang.c
+++ b/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 "frame.h"
+#include "symtab.h"
+#include "gdbtypes.h"
#include "gdbcmd.h"
+#include "expression.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 "gdbtypes.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 "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 "dictionary.h"
+#include "annotate.h"
+#include "valprint.h"
#include "source.h"
+#include "observable.h"
+#include "common/vec.h"
#include "stack.h"
-#include "symfile.h"
-#include "symtab.h"
+#include "common/gdb_vecs.h"
#include "typeprint.h"
-#include "ui-out.h"
-#include "valprint.h"
+#include "namespace.h"
+
+#include "psymtab.h"
#include "value.h"
-#include "varobj.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).
diff --git a/gdb/ada-tasks.c b/gdb/ada-tasks.c
index b143c67..ccabc631 100644
--- a/gdb/ada-tasks.c
+++ b/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 "observable.h"
#include "gdbcmd.h"
+#include "target.h"
+#include "ada-lang.h"
#include "gdbcore.h"
-#include "gdbthread.h"
#include "inferior.h"
-#include "objfiles.h"
-#include "observable.h"
+#include "gdbthread.h"
#include "progspace.h"
-#include "target.h"
+#include "objfiles.h"
static int ada_build_task_list ();
diff --git a/gdb/ada-typeprint.c b/gdb/ada-typeprint.c
index 4502b81..efcd14b 100644
--- a/gdb/ada-typeprint.c
+++ b/gdb/ada-typeprint.c
@@ -17,28 +17,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 "ada-lang.h"
-#include "bfd.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 "bfd.h" /* Binary File Description */
#include "symtab.h"
-#include "target-float.h"
+#include "gdbtypes.h"
+#include "expression.h"
+#include "value.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 "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,
diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c
index 3fa7d90..d4661e1 100644
--- a/gdb/ada-valprint.c
+++ b/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 "symtab.h"
+#include "gdbtypes.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 "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 "valprint.h"
-#include "value.h"
static int print_field_values (struct type *, const gdb_byte *,
int,
diff --git a/gdb/ada-varobj.c b/gdb/ada-varobj.c
index 3f375c8..a4d553d 100644
--- a/gdb/ada-varobj.c
+++ b/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:
diff --git a/gdb/addrmap.c b/gdb/addrmap.c
index d49076b..6c3ed69 100644
--- a/gdb/addrmap.c
+++ b/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". */
diff --git a/gdb/agent.c b/gdb/agent.c
index aa3e0df..8b777d0 100644
--- a/gdb/agent.c
+++ b/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". */
diff --git a/gdb/aix-thread.c b/gdb/aix-thread.c
index 7646a3d..ffa3352 100644
--- a/gdb/aix-thread.c
+++ b/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/pthdebug.h>
+#include <sys/types.h>
#include <sys/ptrace.h>
#include <sys/reg.h>
-#include <sys/types.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"
+#include <sched.h>
+#include <sys/pthdebug.h>
#if !HAVE_DECL_GETTHRDS
extern int getthrds (pid_t, struct thrdsinfo64 *, int, tid_t *, int);
diff --git a/gdb/alpha-bsd-nat.c b/gdb/alpha-bsd-nat.c
index d516604..b12d19f 100644
--- a/gdb/alpha-bsd-nat.c
+++ b/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;
diff --git a/gdb/alpha-bsd-tdep.c b/gdb/alpha-bsd-tdep.c
index a032f95..350c197 100644
--- a/gdb/alpha-bsd-tdep.c
+++ b/gdb/alpha-bsd-tdep.c
@@ -18,11 +18,10 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
+#include "regcache.h"
-/* Local non-gdb includes. */
-#include "alpha-bsd-tdep.h"
#include "alpha-tdep.h"
-#include "regcache.h"
+#include "alpha-bsd-tdep.h"
/* Conviently, GDB uses the same register numbering as the
ptrace register structure used by BSD on Alpha. */
diff --git a/gdb/alpha-linux-nat.c b/gdb/alpha-linux-nat.c
index 91f5b4c..1880697 100644
--- a/gdb/alpha-linux-nat.c
+++ b/gdb/alpha-linux-nat.c
@@ -17,18 +17,17 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
+#include "target.h"
+#include "regcache.h"
+#include "linux-nat-trad.h"
-/* Standard C includes. */
+#include "alpha-tdep.h"
+
+#include "nat/gdb_ptrace.h"
#include <alpha/ptrace.h>
-#include <sys/procfs.h>
-/* Local non-gdb includes. */
-#include "alpha-tdep.h"
+#include <sys/procfs.h>
#include "gregset.h"
-#include "linux-nat-trad.h"
-#include "nat/gdb_ptrace.h"
-#include "regcache.h"
-#include "target.h"
/* The address of UNIQUE for ptrace. */
#define ALPHA_UNIQUE_PTRACE_ADDR 65
diff --git a/gdb/alpha-linux-tdep.c b/gdb/alpha-linux-tdep.c
index fbfd6b3..bfa611e 100644
--- a/gdb/alpha-linux-tdep.c
+++ b/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
diff --git a/gdb/alpha-mdebug-tdep.c b/gdb/alpha-mdebug-tdep.c
index 590aa8e..caab08b 100644
--- a/gdb/alpha-mdebug-tdep.c
+++ b/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 "mdebugread.h"
+#include "frame-unwind.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* */
diff --git a/gdb/alpha-nbsd-tdep.c b/gdb/alpha-nbsd-tdep.c
index 1922fec..534b646 100644
--- a/gdb/alpha-nbsd-tdep.c
+++ b/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. */
diff --git a/gdb/alpha-obsd-tdep.c b/gdb/alpha-obsd-tdep.c
index 0e6450f..d7e2926 100644
--- a/gdb/alpha-obsd-tdep.c
+++ b/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. */
diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c
index b47b0f0..af9b9b9 100644
--- a/gdb/alpha-tdep.c
+++ b/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 "inferior.h"
-#include "linespec.h"
+#include "dis-asm.h"
+#include "symfile.h"
#include "objfiles.h"
-#include "osabi.h"
+#include "linespec.h"
#include "regcache.h"
#include "reggroups.h"
-#include "symfile.h"
-#include "symtab.h"
+#include "arch-utils.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
diff --git a/gdb/amd64-bsd-nat.c b/gdb/amd64-bsd-nat.c
index 07ddb86..35763a5 100644
--- a/gdb/amd64-bsd-nat.c
+++ b/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"
diff --git a/gdb/amd64-darwin-tdep.c b/gdb/amd64-darwin-tdep.c
index 5d21ba7..46867f4 100644
--- a/gdb/amd64-darwin-tdep.c
+++ b/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 "gdbcore.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 "regcache.h"
-#include "solib-darwin.h"
-#include "solib.h"
-#include "symtab.h"
-#include "target.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. */
diff --git a/gdb/amd64-dicos-tdep.c b/gdb/amd64-dicos-tdep.c
index 4dbb201..8ca838e 100644
--- a/gdb/amd64-dicos-tdep.c
+++ b/gdb/amd64-dicos-tdep.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 "osabi.h"
#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)
diff --git a/gdb/amd64-fbsd-nat.c b/gdb/amd64-fbsd-nat.c
index 4e52910..cc676d3 100644
--- a/gdb/amd64-fbsd-nat.c
+++ b/gdb/amd64-fbsd-nat.c
@@ -18,26 +18,23 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
+#include "inferior.h"
+#include "regcache.h"
+#include "target.h"
-/* Standard C includes. */
-#include <machine/reg.h>
#include <signal.h>
+#include <sys/types.h>
#include <sys/ptrace.h>
#include <sys/sysctl.h>
-#include <sys/types.h>
#include <sys/user.h>
+#include <machine/reg.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 "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
diff --git a/gdb/amd64-fbsd-tdep.c b/gdb/amd64-fbsd-tdep.c
index 9c5ff30..7e2e9ed 100644
--- a/gdb/amd64-fbsd-tdep.c
+++ b/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. */
diff --git a/gdb/amd64-linux-nat.c b/gdb/amd64-linux-nat.c
index 853c73c..a0bb105 100644
--- a/gdb/amd64-linux-nat.c
+++ b/gdb/amd64-linux-nat.c
@@ -19,27 +19,25 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
-
-/* Standard C includes. */
+#include "inferior.h"
+#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 "elf/common.h"
-#include "gdb_proc_service.h"
-#include "gregset.h"
+#include "amd64-linux-tdep.h"
#include "i386-linux-tdep.h"
-#include "inferior.h"
-#include "nat/amd64-linux-siginfo.h"
-#include "nat/gdb_ptrace.h"
-#include "nat/linux-ptrace.h"
-#include "regcache.h"
+#include "common/x86-xstate.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. */
diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c
index 8d27225..5475cf62 100644
--- a/gdb/amd64-linux-tdep.c
+++ b/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 "symtab.h"
-#include "target-descriptions.h"
+#include "parser-defs.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"
diff --git a/gdb/amd64-nat.c b/gdb/amd64-nat.c
index 1c02d35..3dcac73 100644
--- a/gdb/amd64-nat.c
+++ b/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
diff --git a/gdb/amd64-nbsd-nat.c b/gdb/amd64-nbsd-nat.c
index 3a610cb..24e3aae 100644
--- a/gdb/amd64-nbsd-nat.c
+++ b/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
diff --git a/gdb/amd64-nbsd-tdep.c b/gdb/amd64-nbsd-tdep.c
index 99b1722..06905d6 100644
--- a/gdb/amd64-nbsd-tdep.c
+++ b/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
diff --git a/gdb/amd64-obsd-nat.c b/gdb/amd64-obsd-nat.c
index cf6694e..4963c42 100644
--- a/gdb/amd64-obsd-nat.c
+++ b/gdb/amd64-obsd-nat.c
@@ -18,15 +18,14 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
+#include "gdbcore.h"
+#include "regcache.h"
+#include "target.h"
-/* Local non-gdb includes. */
+#include "amd64-tdep.h"
#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"
/* Mapping between the general-purpose registers in OpenBSD/amd64
`struct reg' format and GDB's register cache layout for
diff --git a/gdb/amd64-obsd-tdep.c b/gdb/amd64-obsd-tdep.c
index 71a263f..cd1a1c3 100644
--- a/gdb/amd64-obsd-tdep.c
+++ b/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. */
diff --git a/gdb/amd64-sol2-tdep.c b/gdb/amd64-sol2-tdep.c
index 7d691e8..56d2e22 100644
--- a/gdb/amd64-sol2-tdep.c
+++ b/gdb/amd64-sol2-tdep.c
@@ -20,17 +20,16 @@
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 "osabi.h"
+#include "symtab.h"
+
#include "sol2-tdep.h"
+#include "amd64-tdep.h"
+#include "common/x86-xstate.h"
#include "solib-svr4.h"
-#include "symtab.h"
/* Mapping between the general-purpose registers in gregset_t format
and GDB's register cache layout. */
diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
index 16c3e61..d589295 100644
--- a/gdb/amd64-tdep.c
+++ b/gdb/amd64-tdep.c
@@ -20,38 +20,34 @@
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 "opcode/i386.h"
+#include "dis-asm.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 "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.
diff --git a/gdb/amd64-windows-nat.c b/gdb/amd64-windows-nat.c
index dcefa9f..378262a 100644
--- a/gdb/amd64-windows-nat.c
+++ b/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[] =
diff --git a/gdb/amd64-windows-tdep.c b/gdb/amd64-windows-tdep.c
index 9dfa8e4..922da9e 100644
--- a/gdb/amd64-windows-tdep.c
+++ b/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 "osabi.h"
#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 "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[] =
diff --git a/gdb/annotate.c b/gdb/annotate.c
index 20df956..97cb4c8 100644
--- a/gdb/annotate.c
+++ b/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. */
diff --git a/gdb/annotate.h b/gdb/annotate.h
index b55dffe..4a9e1b5 100644
--- a/gdb/annotate.h
+++ b/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);
diff --git a/gdb/arc-newlib-tdep.c b/gdb/arc-newlib-tdep.c
index c91ec3a..5fa4094 100644
--- a/gdb/arc-newlib-tdep.c
+++ b/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. */
diff --git a/gdb/arc-tdep.c b/gdb/arc-tdep.c
index 6b899ee..009af11 100644
--- a/gdb/arc-tdep.c
+++ b/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"
diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c
index ab113bc..52a08da 100644
--- a/gdb/arch-utils.c
+++ b/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"
+#include "inferior.h" /* enum CALL_DUMMY_LOCATION et al. */
#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,
diff --git a/gdb/arm-bsd-tdep.c b/gdb/arm-bsd-tdep.c
index f690042..13894c4 100644
--- a/gdb/arm-bsd-tdep.c
+++ b/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>. */
diff --git a/gdb/arm-fbsd-nat.c b/gdb/arm-fbsd-nat.c
index f0b0780..f85ecc1 100644
--- a/gdb/arm-fbsd-nat.c
+++ b/gdb/arm-fbsd-nat.c
@@ -18,18 +18,16 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
+#include "target.h"
-/* Standard C includes. */
-#include <machine/reg.h>
-#include <sys/ptrace.h>
#include <sys/types.h>
+#include <sys/ptrace.h>
+#include <machine/reg.h>
-/* Local non-gdb includes. */
-#include "arm-fbsd-tdep.h"
-#include "arm-tdep.h"
#include "fbsd-nat.h"
+#include "arm-tdep.h"
+#include "arm-fbsd-tdep.h"
#include "inf-ptrace.h"
-#include "target.h"
struct arm_fbsd_nat_target : public fbsd_nat_target
{
diff --git a/gdb/arm-fbsd-tdep.c b/gdb/arm-fbsd-tdep.c
index c79873c..dea3abb 100644
--- a/gdb/arm-fbsd-tdep.c
+++ b/gdb/arm-fbsd-tdep.c
@@ -19,11 +19,10 @@
#include "defs.h"
-/* Local non-gdb includes. */
-#include "arm-fbsd-tdep.h"
+#include "elf/common.h"
#include "arm-tdep.h"
+#include "arm-fbsd-tdep.h"
#include "auxv.h"
-#include "elf/common.h"
#include "fbsd-tdep.h"
#include "gdbcore.h"
#include "osabi.h"
diff --git a/gdb/arm-linux-nat.c b/gdb/arm-linux-nat.c
index 2c2f695..52668da 100644
--- a/gdb/arm-linux-nat.c
+++ b/gdb/arm-linux-nat.c
@@ -17,29 +17,28 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
+#include "inferior.h"
+#include "gdbcore.h"
+#include "regcache.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"
-/* Standard C includes. */
#include <elf/common.h>
-#include <sys/procfs.h>
#include <sys/user.h>
+#include "nat/gdb_ptrace.h"
#include <sys/utsname.h>
+#include <sys/procfs.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 "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-tdep.h"
/* Prototypes for supply_gregset etc. */
#include "gregset.h"
diff --git a/gdb/arm-linux-tdep.c b/gdb/arm-linux-tdep.c
index 90fadbd..a5ad064 100644
--- a/gdb/arm-linux-tdep.c
+++ b/gdb/arm-linux-tdep.c
@@ -18,45 +18,43 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.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 "breakpoint.h"
+#include "auxv.h"
+#include "xml-syscall.h"
-/* Standard C includes. */
-#include <ctype.h>
-
-/* Local non-gdb includes. */
-#include "arch-utils.h"
+#include "arch/arm.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 "arm-linux-tdep.h"
+#include "linux-tdep.h"
#include "glibc-tdep.h"
+#include "arch-utils.h"
#include "inferior.h"
#include "infrun.h"
-#include "linux-record.h"
-#include "linux-tdep.h"
-#include "osabi.h"
-#include "parser-defs.h"
+#include "gdbthread.h"
+#include "symfile.h"
+
#include "record-full.h"
-#include "regcache.h"
-#include "regset.h"
-#include "solib-svr4.h"
+#include "linux-record.h"
+
+#include "cli/cli-utils.h"
#include "stap-probe.h"
-#include "symfile.h"
-#include "target.h"
-#include "trad-frame.h"
-#include "tramp-frame.h"
+#include "parser-defs.h"
#include "user-regs.h"
-#include "value.h"
-#include "xml-syscall.h"
-
+#include <ctype.h>
+#include "elf/common.h"
extern int arm_apcs_32;
/* Under ARM GNU/Linux the traditional way of performing a breakpoint
diff --git a/gdb/arm-nbsd-nat.c b/gdb/arm-nbsd-nat.c
index 09f4f0f..2a83553 100644
--- a/gdb/arm-nbsd-nat.c
+++ b/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
{
diff --git a/gdb/arm-nbsd-tdep.c b/gdb/arm-nbsd-tdep.c
index 2a13bad..6b78230 100644
--- a/gdb/arm-nbsd-tdep.c
+++ b/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. */
diff --git a/gdb/arm-obsd-tdep.c b/gdb/arm-obsd-tdep.c
index 44d9d99..a6055ab 100644
--- a/gdb/arm-obsd-tdep.c
+++ b/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
diff --git a/gdb/arm-pikeos-tdep.c b/gdb/arm-pikeos-tdep.c
index 250346f..21add74 100644
--- a/gdb/arm-pikeos-tdep.c
+++ b/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
diff --git a/gdb/arm-symbian-tdep.c b/gdb/arm-symbian-tdep.c
index e078655..71521de 100644
--- a/gdb/arm-symbian-tdep.c
+++ b/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. */
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 07280cf..599f785 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -19,54 +19,55 @@
#include "defs.h"
-/* Standard C includes. */
-#include <ctype.h>
+#include <ctype.h> /* XXX for isupper (). */
-/* Standard C++ includes. */
-#include <algorithm>
-
-/* Local non-gdb includes. */
+#include "frame.h"
+#include "inferior.h"
+#include "infrun.h"
+#include "gdbcmd.h"
+#include "gdbcore.h"
+#include "dis-asm.h" /* For register styles. */
+#include "disasm.h"
+#include "regcache.h"
+#include "reggroups.h"
+#include "target-float.h"
+#include "value.h"
#include "arch-utils.h"
-#include "arch/arm-get-next-pcs.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 "user-regs.h"
+#include "observable.h"
+
#include "arch/arm.h"
+#include "arch/arm-get-next-pcs.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 "gdb/sim-arm.h"
+
#include "elf-bfd.h"
+#include "coff/internal.h"
#include "elf/arm.h"
-#include "features/arm/arm-with-iwmmxt.c"
+
+#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-m.c"
-#include "features/arm/arm-with-neon.c"
+#include "features/arm/arm-with-iwmmxt.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 "observable.h"
-#include "osabi.h"
-#include "prologue-value.h"
-#include "record-full.h"
-#include "record.h"
-#include "regcache.h"
-#include "reggroups.h"
-#include "remote.h"
-#include "target-descriptions.h"
-#include "target-float.h"
-#include "trad-frame.h"
-#include "user-regs.h"
-#include "value.h"
+#include "features/arm/arm-with-neon.c"
#if GDB_SELF_TEST
#include "common/selftest.h"
diff --git a/gdb/arm-wince-tdep.c b/gdb/arm-wince-tdep.c
index 0ca6c81..6eae60e 100644
--- a/gdb/arm-wince-tdep.c
+++ b/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 };
diff --git a/gdb/auto-load.c b/gdb/auto-load.c
index fd40cbb..ae7a189 100644
--- a/gdb/auto-load.c
+++ b/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 "readline/tilde.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 "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).
diff --git a/gdb/auxv.c b/gdb/auxv.c
index e654abd..13caa93 100644
--- a/gdb/auxv.c
+++ b/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 "target.h"
#include "gdbtypes.h"
+#include "command.h"
#include "inferior.h"
-#include "objfiles.h"
-#include "observable.h"
-#include "target.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
diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c
index 64be41a..6d11ee1 100644
--- a/gdb/avr-tdep.c
+++ b/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:
diff --git a/gdb/ax-gdb.c b/gdb/ax-gdb.c
index 0783ab1..778e895 100644
--- a/gdb/ax-gdb.c
+++ b/gdb/ax-gdb.c
@@ -18,36 +18,35 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
-
-/* Local non-gdb includes. */
-#include "arch-utils.h"
-#include "ax-gdb.h"
+#include "symtab.h"
+#include "symfile.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 "c-lang.h"
-#include "cli/cli-utils.h"
-#include "command.h"
-#include "common/format.h"
+#include "tracepoint.h"
#include "cp-support.h"
-#include "dictionary.h"
-#include "expression.h"
-#include "frame.h"
-#include "gdbcmd.h"
-#include "gdbtypes.h"
-#include "language.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,
diff --git a/gdb/ax-gdb.h b/gdb/ax-gdb.h
index 49ea26e..4420b65 100644
--- a/gdb/ax-gdb.h
+++ b/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;
diff --git a/gdb/ax-general.c b/gdb/ax-general.c
index c849932..f956dfc 100644
--- a/gdb/ax-general.c
+++ b/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);
diff --git a/gdb/bcache.c b/gdb/bcache.c
index 37ca7c4..14a7847 100644
--- a/gdb/bcache.c
+++ b/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
diff --git a/gdb/bfd-target.c b/gdb/bfd-target.c
index 15a9e60..ffe85ae 100644
--- a/gdb/bfd-target.c
+++ b/gdb/bfd-target.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 "target.h"
#include "bfd-target.h"
#include "exec.h"
#include "gdb_bfd.h"
-#include "target.h"
/* A target that wraps a BFD. */
diff --git a/gdb/bfin-linux-tdep.c b/gdb/bfin-linux-tdep.c
index bfdc106..3fc6b6a 100644
--- a/gdb/bfin-linux-tdep.c
+++ b/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>. */
diff --git a/gdb/bfin-tdep.c b/gdb/bfin-tdep.c
index 830cb1c..9d3e8eb 100644
--- a/gdb/bfin-tdep.c
+++ b/gdb/bfin-tdep.c
@@ -20,27 +20,25 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
-
-/* Local non-gdb includes. */
+#include "inferior.h"
+#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 "sim-regno.h"
-#include "symtab.h"
-#include "trad-frame.h"
+#include "infcall.h"
#include "xml-syscall.h"
+#include "bfin-tdep.h"
/* Macros used by prologue functions. */
#define P_LINKAGE 0xE800
diff --git a/gdb/block.c b/gdb/block.c
index 366141c..63c7d9f 100644
--- a/gdb/block.c
+++ b/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
diff --git a/gdb/blockframe.c b/gdb/blockframe.c
index 8b1acab..fe7807b 100644
--- a/gdb/blockframe.c
+++ b/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 "symtab.h"
#include "bfd.h"
-#include "block.h"
-#include "command.h"
-#include "dummy-frame.h"
+#include "objfiles.h"
#include "frame.h"
-#include "gdbcmd.h"
#include "gdbcore.h"
+#include "value.h"
+#include "target.h"
#include "inferior.h"
-#include "inline-frame.h"
-#include "objfiles.h"
+#include "annotate.h"
#include "regcache.h"
-#include "symtab.h"
-#include "target.h"
-#include "value.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.
diff --git a/gdb/break-catch-sig.c b/gdb/break-catch-sig.c
index 14f901f..53540ee 100644
--- a/gdb/break-catch-sig.c
+++ b/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)
diff --git a/gdb/break-catch-syscall.c b/gdb/break-catch-syscall.c
index 1d02e9b..6a911fb 100644
--- a/gdb/break-catch-syscall.c
+++ b/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.
diff --git a/gdb/break-catch-throw.c b/gdb/break-catch-throw.c
index bad882f..c8d66e0 100644
--- a/gdb/break-catch-throw.c
+++ b/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 "gdbcmd.h"
+#include "inferior.h"
+#include "annotate.h"
+#include "valprint.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 "location.h"
#include "mi/mi-common.h"
-#include "objfiles.h"
+#include "linespec.h"
#include "probe.h"
-#include "valprint.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
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index ed68335..7799d1c 100644
--- a/gdb/breakpoint.c
+++ b/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 "block.h"
+#include <ctype.h>
+#include "hashtab.h"
+#include "symtab.h"
+#include "frame.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 "tracepoint.h"
+#include "gdbtypes.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 "gdbcmd.h"
+#include "value.h"
+#include "command.h"
#include "inferior.h"
#include "infrun.h"
-#include "interps.h"
-#include "jit.h"
+#include "gdbthread.h"
+#include "target.h"
#include "language.h"
-#include "linespec.h"
-#include "memattr.h"
-#include "mi/mi-main.h"
+#include "gdb-demangle.h"
+#include "filenames.h"
+#include "annotate.h"
+#include "symfile.h"
#include "objfiles.h"
+#include "source.h"
+#include "linespec.h"
+#include "completer.h"
+#include "ui-out.h"
+#include "cli/cli-script.h"
+#include "block.h"
+#include "solib.h"
+#include "solist.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 "skip.h"
-#include "solib.h"
-#include "solist.h"
-#include "source.h"
+#include "cli/cli-utils.h"
+#include "continuations.h"
#include "stack.h"
-#include "symfile.h"
-#include "symtab.h"
-#include "target.h"
+#include "skip.h"
+#include "ax-gdb.h"
+#include "dummy-frame.h"
+#include "interps.h"
+#include "common/format.h"
#include "thread-fsm.h"
#include "tid-parse.h"
-#include "top.h"
-#include "tracepoint.h"
-#include "ui-out.h"
-#include "valprint.h"
-#include "value.h"
+#include "cli/cli-style.h"
+#include "mi/mi-main.h"
/* readline include files */
#include "readline/readline.h"
diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
index 3221719..a91e3e3 100644
--- a/gdb/breakpoint.h
+++ b/gdb/breakpoint.h
@@ -19,19 +19,17 @@
#if !defined (BREAKPOINT_H)
#define BREAKPOINT_H 1
-#include <vector>
-
-/* Local non-gdb includes. */
+#include "frame.h"
+#include "value.h"
+#include "common/vec.h"
#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 "location.h"
+#include <vector>
+#include "common/array-view.h"
+#include "cli/cli-script.h"
struct block;
struct gdbpy_breakpoint_object;
diff --git a/gdb/bsd-uthread.c b/gdb/bsd-uthread.c
index a4cc3c9..af048f7 100644
--- a/gdb/bsd-uthread.c
+++ b/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"),
diff --git a/gdb/btrace.c b/gdb/btrace.c
index bb8eb26..12af468 100644
--- a/gdb/btrace.c
+++ b/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 "target.h"
#include "record.h"
-#include "regcache.h"
-#include "source.h"
#include "symtab.h"
-#include "target.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"
diff --git a/gdb/build-id.c b/gdb/build-id.c
index e21ee29..27f29cd 100644
--- a/gdb/build-id.c
+++ b/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 "symfile.h"
+#include "objfiles.h"
#include "filenames.h"
-#include "gdb_bfd.h"
#include "gdbcore.h"
-#include "objfiles.h"
-#include "symfile.h"
/* See build-id.h. */
diff --git a/gdb/build-id.h b/gdb/build-id.h
index 478410b..b8b033e 100644
--- a/gdb/build-id.h
+++ b/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. */
diff --git a/gdb/buildsym-legacy.c b/gdb/buildsym-legacy.c
index 7327db7..a29c128 100644
--- a/gdb/buildsym-legacy.c
+++ b/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.
diff --git a/gdb/buildsym.c b/gdb/buildsym.c
index 50f0f42..9a23c8f 100644
--- a/gdb/buildsym.c
+++ b/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 "cp-support.h"
-#include "demangle.h"
-#include "dictionary.h"
-#include "expression.h"
-#include "filenames.h"
+#include "bfd.h"
#include "gdb_obstack.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 "objfiles.h"
-#include "symfile.h"
-#include "symtab.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). */
diff --git a/gdb/c-lang.c b/gdb/c-lang.c
index 0438f4b..36c7502 100644
--- a/gdb/c-lang.c
+++ b/gdb/c-lang.c
@@ -18,27 +18,23 @@
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 "symtab.h"
+#include "gdbtypes.h"
+#include "expression.h"
+#include "parser-defs.h"
+#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. */
diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c
index f8e02c2..6690ca5 100644
--- a/gdb/c-typeprint.c
+++ b/gdb/c-typeprint.c
@@ -17,23 +17,21 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
-
-/* Local non-gdb includes. */
-#include "bfd.h"
-#include "c-lang.h"
-#include "cli/cli-style.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 "bfd.h" /* Binary File Description. */
#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 "value.h"
+#include "cp-abi.h"
+#include "cp-support.h"
/* A list of access specifiers used for printing. */
diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c
index d2b07d0..c4306f1 100644
--- a/gdb/c-valprint.c
+++ b/gdb/c-valprint.c
@@ -18,19 +18,16 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
-
-/* Local non-gdb includes. */
-#include "c-lang.h"
-#include "cp-abi.h"
-#include "expression.h"
+#include "symtab.h"
#include "gdbtypes.h"
+#include "expression.h"
+#include "value.h"
+#include "valprint.h"
#include "language.h"
-#include "objfiles.h"
-#include "symtab.h"
+#include "c-lang.h"
+#include "cp-abi.h"
#include "target.h"
-#include "valprint.h"
-#include "value.h"
-
+#include "objfiles.h"
/* A helper for c_textual_element_type. This checks the name of the
diff --git a/gdb/c-varobj.c b/gdb/c-varobj.c
index bcbc153..2d24774 100644
--- a/gdb/c-varobj.c
+++ b/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]);
diff --git a/gdb/charset.c b/gdb/charset.c
index 505ccd3..5d8a996 100644
--- a/gdb/charset.c
+++ b/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 "gdbcmd.h"
+#include "gdb_obstack.h"
#include "common/gdb_wait.h"
+#include "charset-list.h"
#include "common/vec.h"
-#include "gdb_obstack.h"
-#include "gdbcmd.h"
+#include "common/environ.h"
+#include "arch-utils.h"
+#include "common/gdb_vecs.h"
+#include <ctype.h>
#ifdef USE_WIN32API
#include <windows.h>
diff --git a/gdb/cli-out.c b/gdb/cli-out.c
index 4665da4..55c8d2b 100644
--- a/gdb/cli-out.c
+++ b/gdb/cli-out.c
@@ -21,13 +21,11 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
-
-/* Local non-gdb includes. */
+#include "ui-out.h"
#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 */
diff --git a/gdb/cli-out.h b/gdb/cli-out.h
index 995d14d..eeb555f 100644
--- a/gdb/cli-out.h
+++ b/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
{
diff --git a/gdb/coff-pe-read.c b/gdb/coff-pe-read.c
index 06da841..f572138 100644
--- a/gdb/coff-pe-read.c
+++ b/gdb/coff-pe-read.c
@@ -23,20 +23,20 @@
#include "defs.h"
-/* Standard C includes. */
-#include <ctype.h>
+#include "coff-pe-read.h"
-/* Local non-gdb includes. */
#include "bfd.h"
-#include "coff-pe-read.h"
-#include "coff/internal.h"
+#include "gdbtypes.h"
+
#include "command.h"
-#include "common/common-utils.h"
#include "gdbcmd.h"
-#include "gdbtypes.h"
-#include "objfiles.h"
-#include "symfile.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 */
diff --git a/gdb/coffread.c b/gdb/coffread.c
index ae0d05b..4354741 100644
--- a/gdb/coffread.c
+++ b/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 "bfd.h"
-#include "block.h"
-#include "breakpoint.h"
-#include "build-id.h"
+#include "coff/internal.h" /* Internal format of COFF symbols in BFD */
+#include "libcoff.h" /* FIXME secret internal data from BFD */
+#include "objfiles.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 "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. */
diff --git a/gdb/complaints.c b/gdb/complaints.c
index b142207..c5b5471 100644
--- a/gdb/complaints.c
+++ b/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. */
diff --git a/gdb/completer.c b/gdb/completer.c
index ae79999..d7cf4fd 100644
--- a/gdb/completer.c
+++ b/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 "symtab.h"
#include "gdbtypes.h"
+#include "expression.h"
+#include "filenames.h" /* For DOSish file names. */
#include "language.h"
-#include "linespec.h"
-#include "location.h"
-#include "reggroups.h"
-#include "symtab.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. */
diff --git a/gdb/completer.h b/gdb/completer.h
index 282e954..52f8d7d 100644
--- a/gdb/completer.h
+++ b/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. */
diff --git a/gdb/continuations.c b/gdb/continuations.c
index 3f565a8..1feee32 100644
--- a/gdb/continuations.c
+++ b/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
{
diff --git a/gdb/corefile.c b/gdb/corefile.c
index 7a99a4d..bf859fb 100644
--- a/gdb/corefile.c
+++ b/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>
-
-/* Local non-gdb includes. */
-#include "bfd.h"
-#include "cli/cli-utils.h"
+#include <fcntl.h>
+#include "inferior.h"
+#include "symtab.h"
#include "command.h"
-#include "completer.h"
-#include "dis-asm.h"
#include "gdbcmd.h"
+#include "bfd.h"
+#include "target.h"
#include "gdbcore.h"
-#include "inferior.h"
+#include "dis-asm.h"
+#include <sys/stat.h>
+#include "completer.h"
#include "observable.h"
-#include "symtab.h"
-#include "target.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
diff --git a/gdb/corelow.c b/gdb/corelow.c
index e7f164f..7fb4297 100644
--- a/gdb/corelow.c
+++ b/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 "command.h"
-#include "common/filestuff.h"
-#include "completer.h"
-#include "exec.h"
-#include "filenames.h"
-#include "frame.h"
-#include "gdb_bfd.h"
-#include "gdbcore.h"
-#include "gdbthread.h"
+#include <signal.h>
+#include <fcntl.h>
+#include "frame.h" /* required by inferior.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 "readline/readline.h"
+#include "gdbcore.h"
+#include "gdbthread.h"
#include "regcache.h"
#include "regset.h"
-#include "solib.h"
#include "symfile.h"
-#include "symtab.h"
-#include "target.h"
+#include "exec.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
diff --git a/gdb/cp-abi.c b/gdb/cp-abi.c
index 07db7ef..b858b19 100644
--- a/gdb/cp-abi.c
+++ b/gdb/cp-abi.c
@@ -18,14 +18,11 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
-
-/* Local non-gdb includes. */
-#include "command.h"
+#include "value.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 };
diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c
index 574ae7e..5b352d1 100644
--- a/gdb/cp-namespace.c
+++ b/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 "symfile.h"
-#include "symtab.h"
+#include <string>
static struct block_symbol
cp_lookup_nested_symbol_1 (struct type *container_type,
diff --git a/gdb/cp-support.c b/gdb/cp-support.c
index 9970f0c..b79dd5c 100644
--- a/gdb/cp-support.c
+++ b/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 "gdbcmd.h"
#include "dictionary.h"
-#include "expression.h"
+#include "objfiles.h"
#include "frame.h"
-#include "gdbcmd.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 "objfiles.h"
+#include <signal.h>
+#include "common/gdb_setjmp.h"
#include "safe-ctype.h"
-#include "symtab.h"
-#include "value.h"
+#include "common/selftest.h"
#define d_left(dc) (dc)->u.s_binary.left
#define d_right(dc) (dc)->u.s_binary.right
diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
index f6e7e53..443c3b0 100644
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -18,26 +18,24 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
-
-/* Local non-gdb includes. */
+#include "gdb_obstack.h"
+#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 "target.h"
#include "cp-abi.h"
+#include "valprint.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 "extension.h"
#include "typeprint.h"
-#include "valprint.h"
-#include "value.h"
+#include "common/byte-vector.h"
/* Controls printing of vtbl's. */
static void
diff --git a/gdb/cris-linux-tdep.c b/gdb/cris-linux-tdep.c
index 8f765b5..27681cb 100644
--- a/gdb/cris-linux-tdep.c
+++ b/gdb/cris-linux-tdep.c
@@ -22,14 +22,13 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
-
-/* Local non-gdb includes. */
-#include "cris-tdep.h"
-#include "linux-tdep.h"
#include "osabi.h"
+#include "linux-tdep.h"
#include "solib-svr4.h"
#include "symtab.h"
+#include "cris-tdep.h"
+
static void
cris_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
{
diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c
index a41335d..8eda058 100644
--- a/gdb/cris-tdep.c
+++ b/gdb/cris-tdep.c
@@ -21,29 +21,30 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
-
-/* Local non-gdb includes. */
-#include "arch-utils.h"
-#include "cris-tdep.h"
-#include "dis-asm.h"
-#include "dwarf2-frame.h"
-#include "frame-base.h"
-#include "frame-unwind.h"
#include "frame.h"
-#include "gdbcmd.h"
-#include "gdbcore.h"
-#include "gdbtypes.h"
+#include "frame-unwind.h"
+#include "frame-base.h"
+#include "trad-frame.h"
+#include "dwarf2-frame.h"
+#include "symtab.h"
#include "inferior.h"
-#include "objfiles.h"
+#include "gdbtypes.h"
+#include "gdbcore.h"
+#include "gdbcmd.h"
+#include "target.h"
+#include "value.h"
#include "opcode/cris.h"
#include "osabi.h"
+#include "arch-utils.h"
#include "regcache.h"
+
+#include "objfiles.h"
+
+#include "solib.h" /* Support for shared libraries. */
#include "solib-svr4.h"
-#include "solib.h"
-#include "symtab.h"
-#include "target.h"
-#include "trad-frame.h"
-#include "value.h"
+#include "dis-asm.h"
+
+#include "cris-tdep.h"
enum cris_num_regs
{
diff --git a/gdb/csky-linux-tdep.c b/gdb/csky-linux-tdep.c
index 235d4db..ab4af9f 100644
--- a/gdb/csky-linux-tdep.c
+++ b/gdb/csky-linux-tdep.c
@@ -20,17 +20,15 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
-
-/* Local non-gdb includes. */
-#include "csky-tdep.h"
-#include "gdbarch.h"
+#include "osabi.h"
#include "glibc-tdep.h"
#include "linux-tdep.h"
-#include "osabi.h"
-#include "regset.h"
+#include "gdbarch.h"
#include "solib-svr4.h"
+#include "regset.h"
#include "trad-frame.h"
#include "tramp-frame.h"
+#include "csky-tdep.h"
/* Functions, definitions, and data structures for C-Sky core file debug. */
diff --git a/gdb/csky-tdep.c b/gdb/csky-tdep.c
index cabc5e1..cd7d8c5 100644
--- a/gdb/csky-tdep.c
+++ b/gdb/csky-tdep.c
@@ -20,47 +20,43 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
-
-/* Standard C++ includes. */
-#include <algorithm>
-#include <vector>
-
-/* Local non-gdb includes. */
-#include "arch-utils.h"
-#include "block.h"
#include "common/gdb_assert.h"
-#include "csky-tdep.h"
-#include "dis-asm.h"
-#include "dwarf2-frame.h"
-#include "elf-bfd.h"
-#include "elf/csky.h"
-#include "floatformat.h"
-#include "frame-base.h"
-#include "frame-unwind.h"
#include "frame.h"
-#include "gdbcmd.h"
-#include "gdbcore.h"
-#include "gdbtypes.h"
-#include "infcall.h"
#include "inferior.h"
+#include "symtab.h"
+#include "value.h"
+#include "gdbcmd.h"
#include "language.h"
+#include "gdbcore.h"
+#include "symfile.h"
#include "objfiles.h"
-#include "opcode/csky.h"
-#include "osabi.h"
+#include "gdbtypes.h"
+#include "target.h"
+#include "arch-utils.h"
#include "regcache.h"
+#include "osabi.h"
+#include "block.h"
#include "reggroups.h"
-#include "regset.h"
-#include "remote.h"
-#include "sim-regno.h"
+#include "elf/csky.h"
+#include "elf-bfd.h"
#include "symcat.h"
-#include "symfile.h"
-#include "symtab.h"
-#include "target-descriptions.h"
-#include "target.h"
+#include "sim-regno.h"
+#include "dis-asm.h"
+#include "frame-unwind.h"
+#include "frame-base.h"
#include "trad-frame.h"
+#include "infcall.h"
+#include "floatformat.h"
+#include "remote.h"
+#include "target-descriptions.h"
+#include "dwarf2-frame.h"
#include "user-regs.h"
#include "valprint.h"
-#include "value.h"
+#include "csky-tdep.h"
+#include "regset.h"
+#include "opcode/csky.h"
+#include <algorithm>
+#include <vector>
/* Control debugging information emitted in this file. */
static int csky_debug = 0;
diff --git a/gdb/ctf.c b/gdb/ctf.c
index 6796931..7a95df7 100644
--- a/gdb/ctf.c
+++ b/gdb/ctf.c
@@ -20,24 +20,18 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
-
-/* Standard C includes. */
-#include <ctype.h>
-#include <sys/stat.h>
-
-/* Standard C++ includes. */
-#include <algorithm>
-
-/* Local non-gdb includes. */
-#include "common/filestuff.h"
-#include "completer.h"
#include "ctf.h"
+#include "tracepoint.h"
+#include "regcache.h"
+#include <sys/stat.h>
#include "exec.h"
-#include "gdbthread.h"
+#include "completer.h"
#include "inferior.h"
-#include "regcache.h"
+#include "gdbthread.h"
#include "tracefile.h"
-#include "tracepoint.h"
+#include <ctype.h>
+#include <algorithm>
+#include "common/filestuff.h"
/* The CTF target. */
diff --git a/gdb/d-lang.c b/gdb/d-lang.c
index 7fb6c52..637e012 100644
--- a/gdb/d-lang.c
+++ b/gdb/d-lang.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 "c-lang.h"
-#include "cp-support.h"
-#include "d-lang.h"
-#include "demangle.h"
-#include "language.h"
#include "symtab.h"
+#include "language.h"
#include "varobj.h"
+#include "d-lang.h"
+#include "c-lang.h"
+#include "demangle.h"
+#include "cp-support.h"
/* The name of the symbol to use to get the name of the main subprogram. */
static const char D_MAIN[] = "D main";
diff --git a/gdb/d-namespace.c b/gdb/d-namespace.c
index e5d4adf..4edef18 100644
--- a/gdb/d-namespace.c
+++ b/gdb/d-namespace.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 "symtab.h"
#include "block.h"
-#include "d-lang.h"
-#include "gdb_obstack.h"
#include "language.h"
#include "namespace.h"
-#include "symtab.h"
+#include "d-lang.h"
+#include "g[...]
[diff truncated at 100000 bytes]
More information about the Gdb-cvs
mailing list