19 files changed, 197 insertions, 109 deletions
diff --git a/gdb/mi/mi-cmd-break.c b/gdb/mi/mi-cmd-break.c
index 4f25977311d..2e111aaca36 100644
--- a/gdb/mi/mi-cmd-break.c
+++ b/gdb/mi/mi-cmd-break.c
@@ -18,21 +18,27 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "arch-utils.h"
+#include "mi/mi-cmd-break.h"
+
+/* Standard C includes.  */
+#include <ctype.h>
+
+/* Local non-gdb includes.  */
 #include "mi-cmds.h"
-#include "ui-out.h"
-#include "mi-out.h"
-#include "breakpoint.h"
 #include "mi-getopt.h"
-#include "observable.h"
 #include "mi-main.h"
-#include "mi-cmd-break.h"
+#include "mi-out.h"
+
+/* Local includes.  */
+#include "arch-utils.h"
+#include "breakpoint.h"
+#include "gdb_obstack.h"
 #include "language.h"
-#include "location.h"
 #include "linespec.h"
-#include "gdb_obstack.h"
-#include <ctype.h>
+#include "location.h"
+#include "observable.h"
 #include "tracepoint.h"
+#include "ui-out.h"
 
 enum
   {
diff --git a/gdb/mi/mi-cmd-catch.c b/gdb/mi/mi-cmd-catch.c
index 87929c48ca4..ab28a7433bb 100644
--- a/gdb/mi/mi-cmd-catch.c
+++ b/gdb/mi/mi-cmd-catch.c
@@ -19,12 +19,16 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "arch-utils.h"
-#include "breakpoint.h"
-#include "ada-lang.h"
+
+/* Local non-gdb includes.  */
+#include "mi-cmd-break.h"
 #include "mi-cmds.h"
 #include "mi-getopt.h"
-#include "mi-cmd-break.h"
+
+/* Local includes.  */
+#include "ada-lang.h"
+#include "arch-utils.h"
+#include "breakpoint.h"
 
 /* Handler for the -catch-assert command.  */
 
diff --git a/gdb/mi/mi-cmd-disas.c b/gdb/mi/mi-cmd-disas.c
index 7d38b8c5e0c..e7bddd862bc 100644
--- a/gdb/mi/mi-cmd-disas.c
+++ b/gdb/mi/mi-cmd-disas.c
@@ -18,13 +18,17 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "arch-utils.h"
-#include "target.h"
-#include "value.h"
+
+/* Local non-gdb includes.  */
 #include "mi-cmds.h"
 #include "mi-getopt.h"
-#include "ui-out.h"
+
+/* Local includes.  */
+#include "arch-utils.h"
 #include "disasm.h"
+#include "target.h"
+#include "ui-out.h"
+#include "value.h"
 
 /* The arguments to be passed on the command line and parsed here are
    either:
diff --git a/gdb/mi/mi-cmd-env.c b/gdb/mi/mi-cmd-env.c
index fcc49b9eb36..987e83c344e 100644
--- a/gdb/mi/mi-cmd-env.c
+++ b/gdb/mi/mi-cmd-env.c
@@ -19,19 +19,27 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "inferior.h"
-#include "value.h"
-#include "mi-out.h"
+
+/* Standard C includes.  */
+#include <sys/stat.h>
+
+/* Local non-gdb includes.  */
 #include "mi-cmds.h"
 #include "mi-getopt.h"
-#include "symtab.h"
-#include "target.h"
+#include "mi-out.h"
+
+/* Local subdirectory includes.  */
 #include "common/environ.h"
+
+/* Local includes.  */
 #include "command.h"
-#include "ui-out.h"
-#include "top.h"
-#include <sys/stat.h>
+#include "inferior.h"
 #include "source.h"
+#include "symtab.h"
+#include "target.h"
+#include "top.h"
+#include "ui-out.h"
+#include "value.h"
 
 static const char path_var_name[] = "PATH";
 static char *orig_path = NULL;
diff --git a/gdb/mi/mi-cmd-file.c b/gdb/mi/mi-cmd-file.c
index 714ab01b264..f466d21c4de 100644
--- a/gdb/mi/mi-cmd-file.c
+++ b/gdb/mi/mi-cmd-file.c
@@ -18,17 +18,21 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
+
+/* Local non-gdb includes.  */
 #include "mi-cmds.h"
 #include "mi-getopt.h"
 #include "mi-interp.h"
-#include "ui-out.h"
-#include "symtab.h"
-#include "source.h"
+
+/* Local includes.  */
+#include "gdb_regex.h"
 #include "objfiles.h"
 #include "psymtab.h"
 #include "solib.h"
 #include "solist.h"
-#include "gdb_regex.h"
+#include "source.h"
+#include "symtab.h"
+#include "ui-out.h"
 
 /* Return to the client the absolute path and line number of the 
    current file being executed.  */
diff --git a/gdb/mi/mi-cmd-info.c b/gdb/mi/mi-cmd-info.c
index 39da6c489d4..a8f54e9f0f6 100644
--- a/gdb/mi/mi-cmd-info.c
+++ b/gdb/mi/mi-cmd-info.c
@@ -17,10 +17,14 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "osdata.h"
+
+/* Local non-gdb includes.  */
 #include "mi-cmds.h"
+
+/* Local includes.  */
 #include "ada-lang.h"
 #include "arch-utils.h"
+#include "osdata.h"
 
 /* Implement the "-info-ada-exceptions" GDB/MI command.  */
 
diff --git a/gdb/mi/mi-cmd-stack.c b/gdb/mi/mi-cmd-stack.c
index 119e887e6b3..85c9f376e07 100644
--- a/gdb/mi/mi-cmd-stack.c
+++ b/gdb/mi/mi-cmd-stack.c
@@ -18,24 +18,32 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "target.h"
-#include "frame.h"
-#include "value.h"
+
+/* Standard C includes.  */
+#include <ctype.h>
+
+/* Local non-gdb includes.  */
 #include "mi-cmds.h"
-#include "ui-out.h"
-#include "symtab.h"
+#include "mi-getopt.h"
+#include "mi-parse.h"
+#include "safe-ctype.h"
+
+/* Local subdirectory includes.  */
+#include "common/gdb_optional.h"
+
+/* Local includes.  */
 #include "block.h"
-#include "stack.h"
 #include "dictionary.h"
+#include "extension.h"
+#include "frame.h"
 #include "language.h"
-#include "valprint.h"
+#include "stack.h"
+#include "symtab.h"
+#include "target.h"
+#include "ui-out.h"
 #include "utils.h"
-#include "mi-getopt.h"
-#include "extension.h"
-#include <ctype.h>
-#include "mi-parse.h"
-#include "common/gdb_optional.h"
-#include "safe-ctype.h"
+#include "valprint.h"
+#include "value.h"
 
 enum what_to_list { locals, arguments, all };
 
diff --git a/gdb/mi/mi-cmd-target.c b/gdb/mi/mi-cmd-target.c
index 7f77b98506a..b4e0f79799d 100644
--- a/gdb/mi/mi-cmd-target.c
+++ b/gdb/mi/mi-cmd-target.c
@@ -17,8 +17,12 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
+
+/* Local non-gdb includes.  */
 #include "mi-cmds.h"
 #include "mi-getopt.h"
+
+/* Local includes.  */
 #include "remote.h"
 
 /* Get a file from the target.  */
diff --git a/gdb/mi/mi-cmd-var.c b/gdb/mi/mi-cmd-var.c
index 0c2e0c3b7bf..884c0b9f7a8 100644
--- a/gdb/mi/mi-cmd-var.c
+++ b/gdb/mi/mi-cmd-var.c
@@ -19,19 +19,27 @@
    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 "mi-cmds.h"
+#include "mi-getopt.h"
 #include "mi-main.h"
-#include "ui-out.h"
 #include "mi-out.h"
-#include "varobj.h"
-#include "language.h"
-#include "value.h"
-#include <ctype.h>
-#include "mi-getopt.h"
-#include "gdbthread.h"
 #include "mi-parse.h"
+
+/* Local subdirectory includes.  */
 #include "common/gdb_optional.h"
+
+/* Local includes.  */
+#include "gdbthread.h"
 #include "inferior.h"
+#include "language.h"
+#include "ui-out.h"
+#include "value.h"
+#include "varobj.h"
 
 extern unsigned int varobjdebug;		/* defined in varobj.c.  */
 
diff --git a/gdb/mi/mi-cmds.c b/gdb/mi/mi-cmds.c
index fe30ac2e822..b80fd8bce05 100644
--- a/gdb/mi/mi-cmds.c
+++ b/gdb/mi/mi-cmds.c
@@ -19,10 +19,14 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "top.h"
-#include "mi-cmds.h"
+#include "mi/mi-cmds.h"
+
+/* Local non-gdb includes.  */
 #include "mi-main.h"
 
+/* Local includes.  */
+#include "top.h"
+
 struct mi_cmd;
 static struct mi_cmd **lookup_table (const char *command);
 static void build_table (struct mi_cmd *commands);
diff --git a/gdb/mi/mi-common.c b/gdb/mi/mi-common.c
index c495b808dbb..343959434b7 100644
--- a/gdb/mi/mi-common.c
+++ b/gdb/mi/mi-common.c
@@ -17,7 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "mi-common.h"
+#include "mi/mi-common.h"
 
 static const char * const async_reason_string_lookup[] =
 {
diff --git a/gdb/mi/mi-console.c b/gdb/mi/mi-console.c
index 5d90bef11de..90dc198533f 100644
--- a/gdb/mi/mi-console.c
+++ b/gdb/mi/mi-console.c
@@ -25,7 +25,7 @@
    "&".  */
 
 #include "defs.h"
-#include "mi-console.h"
+#include "mi/mi-console.h"
 
 /* Create a console that wraps the given output stream RAW with the
    string PREFIX and quoting it with QUOTE.  */
diff --git a/gdb/mi/mi-getopt.c b/gdb/mi/mi-getopt.c
index 7adb722e526..e1284295676 100644
--- a/gdb/mi/mi-getopt.c
+++ b/gdb/mi/mi-getopt.c
@@ -18,7 +18,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "mi-getopt.h"
+#include "mi/mi-getopt.h"
+
 /* See comments about mi_getopt and mi_getopt_silent in mi-getopt.h.
    When there is an unknown option, if ERROR_ON_UNKNOWN is true,
    throw an error, otherwise return -1.  */
diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c
index 3c5a0d8fb78..46ab367f11e 100644
--- a/gdb/mi/mi-interp.c
+++ b/gdb/mi/mi-interp.c
@@ -18,26 +18,33 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "interps.h"
-#include "event-top.h"
+#include "mi/mi-interp.h"
+
+/* Local non-gdb includes.  */
+#include "mi-cmds.h"
+#include "mi-common.h"
+#include "mi-console.h"
+#include "mi-main.h"
+#include "mi-out.h"
+
+/* Local subdirectory includes.  */
+#include "cli/cli-interp.h"
+
+/* Local includes.  */
+#include "cli-out.h"
 #include "event-loop.h"
+#include "event-top.h"
+#include "gdbthread.h"
 #include "inferior.h"
 #include "infrun.h"
-#include "ui-out.h"
-#include "top.h"
-#include "mi-main.h"
-#include "mi-cmds.h"
-#include "mi-out.h"
-#include "mi-console.h"
-#include "mi-common.h"
+#include "interps.h"
+#include "objfiles.h"
 #include "observable.h"
-#include "gdbthread.h"
 #include "solist.h"
-#include "objfiles.h"
-#include "tracepoint.h"
-#include "cli-out.h"
 #include "thread-fsm.h"
-#include "cli/cli-interp.h"
+#include "top.h"
+#include "tracepoint.h"
+#include "ui-out.h"
 
 /* These are the interpreter setup, etc. functions for the MI
    interpreter.  */
diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index 06559851745..d53ed399f96 100644
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -20,49 +20,58 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "arch-utils.h"
-#include "target.h"
-#include "inferior.h"
-#include "infrun.h"
-#include "top.h"
-#include "gdbthread.h"
+#include "mi/mi-main.h"
+
+/* Standard C includes.  */
+#include <ctype.h>
+
+/* Standard C++ includes.  */
+#include <algorithm>
+#include <chrono>
+#include <map>
+#include <set>
+
+/* Local non-gdb includes.  */
 #include "mi-cmds.h"
-#include "mi-parse.h"
-#include "mi-getopt.h"
+#include "mi-common.h"
 #include "mi-console.h"
-#include "ui-out.h"
+#include "mi-getopt.h"
 #include "mi-out.h"
-#include "interps.h"
+#include "mi-parse.h"
+
+/* Local subdirectory includes.  */
+#include "common/byte-vector.h"
+#include "common/gdb_optional.h"
+#include "common/gdb_splay_tree.h"
+#include "common/rsp-low.h"
+#include "common/run-time-clock.h"
+
+/* Local includes.  */
+#include "ada-lang.h"
+#include "arch-utils.h"
+#include "ctf.h"
 #include "event-loop.h"
 #include "event-top.h"
-#include "gdbcore.h"		/* For write_memory().  */
-#include "value.h"
-#include "regcache.h"
+#include "extension.h"
 #include "frame.h"
-#include "mi-main.h"
-#include "mi-common.h"
+#include "gdbcmd.h"
+#include "gdbcore.h"
+#include "gdbthread.h"
+#include "inferior.h"
+#include "infrun.h"
+#include "interps.h"
 #include "language.h"
-#include "valprint.h"
-#include "osdata.h"
-#include "common/gdb_splay_tree.h"
-#include "tracepoint.h"
-#include "ctf.h"
-#include "ada-lang.h"
 #include "linespec.h"
-#include "extension.h"
-#include "gdbcmd.h"
 #include "observable.h"
-#include "common/gdb_optional.h"
-#include "common/byte-vector.h"
-
-#include <ctype.h>
-#include "common/run-time-clock.h"
-#include <chrono>
+#include "osdata.h"
 #include "progspace-and-thread.h"
-#include "common/rsp-low.h"
-#include <algorithm>
-#include <set>
-#include <map>
+#include "regcache.h"
+#include "target.h"
+#include "top.h"
+#include "tracepoint.h"
+#include "ui-out.h"
+#include "valprint.h"
+#include "value.h"
 
 enum
   {
diff --git a/gdb/mi/mi-out.c b/gdb/mi/mi-out.c
index e485beef69c..6759ab8bd65 100644
--- a/gdb/mi/mi-out.c
+++ b/gdb/mi/mi-out.c
@@ -20,10 +20,12 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "mi-out.h"
+#include "mi/mi-out.h"
 
+/* Standard C++ includes.  */
 #include <vector>
 
+/* Local includes.  */
 #include "interps.h"
 #include "ui-out.h"
 #include "utils.h"
diff --git a/gdb/mi/mi-parse.c b/gdb/mi/mi-parse.c
index cc6a4419d08..04498015c36 100644
--- a/gdb/mi/mi-parse.c
+++ b/gdb/mi/mi-parse.c
@@ -20,12 +20,19 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "mi-cmds.h"
-#include "mi-parse.h"
-#include "charset.h"
+#include "mi/mi-parse.h"
 
+/* Standard C includes.  */
 #include <ctype.h>
+
+/* Local non-gdb includes.  */
+#include "mi-cmds.h"
+
+/* Local subdirectory includes.  */
 #include "cli/cli-utils.h"
+
+/* Local includes.  */
+#include "charset.h"
 #include "language.h"
 
 static const char mi_no_values[] = "--no-values";
diff --git a/gdb/mi/mi-parse.h b/gdb/mi/mi-parse.h
index 2262ff56f96..cd8954f1300 100644
--- a/gdb/mi/mi-parse.h
+++ b/gdb/mi/mi-parse.h
@@ -20,9 +20,13 @@
 #ifndef MI_MI_PARSE_H
 #define MI_MI_PARSE_H
 
-#include "common/run-time-clock.h"
 #include <chrono>
-#include "mi-cmds.h"  /* For enum print_values.  */
+
+/* Local non-gdb includes.  */
+#include "mi-cmds.h"
+
+/* Local subdirectory includes.  */
+#include "common/run-time-clock.h"
 
 /* MI parser */
 
diff --git a/gdb/mi/mi-symbol-cmds.c b/gdb/mi/mi-symbol-cmds.c
index 78a5590a15d..a8bbad2bb73 100644
--- a/gdb/mi/mi-symbol-cmds.c
+++ b/gdb/mi/mi-symbol-cmds.c
@@ -17,9 +17,13 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
+
+/* Local non-gdb includes.  */
 #include "mi-cmds.h"
-#include "symtab.h"
+
+/* Local includes.  */
 #include "objfiles.h"
+#include "symtab.h"
 #include "ui-out.h"
 
 /* Print the list of all pc addresses and lines of code for the