diff --git a/gdb/ada-typeprint.c b/gdb/ada-typeprint.c
index 3b7faee8a61..4af4968f113 100644
--- a/gdb/ada-typeprint.c
+++ b/gdb/ada-typeprint.c
@@ -17,7 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "bfd.h"		/* Binary File Description */
+#include "bfd.h"
 #include "gdbtypes.h"
 #include "value.h"
 #include "c-lang.h"
diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c
index ee34fc07d33..56c7fd2f5e7 100644
--- a/gdb/arch-utils.c
+++ b/gdb/arch-utils.c
@@ -21,7 +21,7 @@
 
 #include "arch-utils.h"
 #include "gdbcmd.h"
-#include "inferior.h"		/* enum CALL_DUMMY_LOCATION et al.  */
+#include "inferior.h"
 #include "infrun.h"
 #include "regcache.h"
 #include "sim-regno.h"
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index fcdd304eef3..24952840e08 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -19,7 +19,7 @@
 
 #include "defs.h"
 
-#include <ctype.h>		/* XXX for isupper ().  */
+#include <ctype.h>
 
 #include "frame.h"
 #include "language.h"
@@ -27,7 +27,7 @@
 #include "infrun.h"
 #include "gdbcmd.h"
 #include "gdbcore.h"
-#include "dis-asm.h"		/* For register styles.  */
+#include "dis-asm.h"
 #include "disasm.h"
 #include "regcache.h"
 #include "reggroups.h"
diff --git a/gdb/ax-gdb.h b/gdb/ax-gdb.h
index 46584286c1f..4f73385208c 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"  /* For agent_expr_up.  */
+#include "ax.h"
 
 struct expression;
 
diff --git a/gdb/bsd-kvm.c b/gdb/bsd-kvm.c
index 7fb51dcc7f2..0ed95f6246c 100644
--- a/gdb/bsd-kvm.c
+++ b/gdb/bsd-kvm.c
@@ -28,7 +28,7 @@
 #include "process-stratum-target.h"
 #include "value.h"
 #include "gdbcore.h"
-#include "inferior.h"          /* for get_exec_file */
+#include "inferior.h"
 #include "gdbthread.h"
 #include "gdbsupport/pathstuff.h"
 #include "gdbsupport/gdb_tilde_expand.h"
diff --git a/gdb/btrace.h b/gdb/btrace.h
index 0d53cb794e7..994af4c459b 100644
--- a/gdb/btrace.h
+++ b/gdb/btrace.h
@@ -27,7 +27,7 @@
    list of sequential control-flow blocks, one such list per thread.  */
 
 #include "gdbsupport/btrace-common.h"
-#include "target/waitstatus.h" /* For enum target_stop_reason.  */
+#include "target/waitstatus.h"
 #include "gdbsupport/enum-flags.h"
 
 #if defined (HAVE_LIBIPT)
diff --git a/gdb/buildsym.c b/gdb/buildsym.c
index 03d6e03b630..b982afea3d2 100644
--- a/gdb/buildsym.c
+++ b/gdb/buildsym.c
@@ -26,10 +26,10 @@
 #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 "expression.h"
+#include "filenames.h"
 #include "macrotab.h"
-#include "demangle.h"		/* Needed by SYMBOL_INIT_DEMANGLED_NAME.  */
+#include "demangle.h"
 #include "block.h"
 #include "cp-support.h"
 #include "dictionary.h"
diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c
index e141a62311c..e45098268c0 100644
--- a/gdb/c-typeprint.c
+++ b/gdb/c-typeprint.c
@@ -18,7 +18,7 @@
 
 #include "defs.h"
 #include "gdbsupport/gdb_obstack.h"
-#include "bfd.h"		/* Binary File Description.  */
+#include "bfd.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "expression.h"
diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index b801e210d6e..8cadd637151 100644
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -21,17 +21,17 @@
 #include "arch-utils.h"
 #include "readline/tilde.h"
 #include "completer.h"
-#include "target.h"	/* For baud_rate, remote_debug and remote_timeout.  */
-#include "gdbsupport/gdb_wait.h"	/* For shell escape implementation.  */
+#include "target.h"
+#include "gdbsupport/gdb_wait.h"
 #include "gdbcmd.h"
-#include "gdbsupport/gdb_regex.h"	/* Used by apropos_command.  */
+#include "gdbsupport/gdb_regex.h"
 #include "gdb_vfork.h"
 #include "linespec.h"
 #include "expression.h"
 #include "frame.h"
 #include "value.h"
 #include "language.h"
-#include "filenames.h"	/* For DOSish file names.  */
+#include "filenames.h"
 #include "objfiles.h"
 #include "source.h"
 #include "disasm.h"
@@ -59,7 +59,7 @@
 #include "gdbsupport/gdb_tilde_expand.h"
 
 #ifdef TUI
-#include "tui/tui.h"	/* For tui_active et.al.  */
+#include "tui/tui.h"
 #endif
 
 #include <fcntl.h>
diff --git a/gdb/cli/cli-interp.c b/gdb/cli/cli-interp.c
index 6a175f7baa1..829948b4993 100644
--- a/gdb/cli/cli-interp.c
+++ b/gdb/cli/cli-interp.c
@@ -23,7 +23,7 @@
 #include "event-top.h"
 #include "ui-out.h"
 #include "cli-out.h"
-#include "top.h"		/* for "execute_command" */
+#include "top.h"
 #include "ui.h"
 #include "infrun.h"
 #include "observable.h"
diff --git a/gdb/coffread.c b/gdb/coffread.c
index e432693600e..4ca733ebb2e 100644
--- a/gdb/coffread.c
+++ b/gdb/coffread.c
@@ -27,8 +27,8 @@
 #include "gdbsupport/gdb_obstack.h"
 #include <ctype.h>
 
-#include "coff/internal.h"	/* Internal format of COFF symbols in BFD */
-#include "libcoff.h"		/* FIXME secret internal data from BFD */
+#include "coff/internal.h"
+#include "libcoff.h"
 #include "objfiles.h"
 #include "buildsym-legacy.h"
 #include "stabsread.h"
diff --git a/gdb/completer.c b/gdb/completer.c
index 91a29daee36..2abf3998345 100644
--- a/gdb/completer.c
+++ b/gdb/completer.c
@@ -20,7 +20,7 @@
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "expression.h"
-#include "filenames.h"		/* For DOSish file names.  */
+#include "filenames.h"
 #include "language.h"
 #include "gdbsupport/gdb_signals.h"
 #include "target.h"
diff --git a/gdb/corelow.c b/gdb/corelow.c
index 439270f5559..202fe695cae 100644
--- a/gdb/corelow.c
+++ b/gdb/corelow.c
@@ -21,7 +21,7 @@
 #include "arch-utils.h"
 #include <signal.h>
 #include <fcntl.h>
-#include "frame.h"		/* required by inferior.h */
+#include "frame.h"
 #include "inferior.h"
 #include "infrun.h"
 #include "symtab.h"
diff --git a/gdb/cp-support.h b/gdb/cp-support.h
index 157f522cb25..709dca46df1 100644
--- a/gdb/cp-support.h
+++ b/gdb/cp-support.h
@@ -22,8 +22,6 @@
 #ifndef CP_SUPPORT_H
 #define CP_SUPPORT_H
 
-/* We need this for 'domain_enum', alas...  */
-
 #include "symtab.h"
 #include "gdbsupport/gdb_vecs.h"
 #include "gdbsupport/gdb_obstack.h"
diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c
index af8fb95a5d2..9847516d9b8 100644
--- a/gdb/cris-tdep.c
+++ b/gdb/cris-tdep.c
@@ -41,7 +41,7 @@
 
 #include "objfiles.h"
 
-#include "solib.h"              /* Support for shared libraries.  */
+#include "solib.h"
 #include "solib-svr4.h"
 #include "dis-asm.h"
 
diff --git a/gdb/dbxread.c b/gdb/dbxread.c
index 958b6db6615..3afafa77fb4 100644
--- a/gdb/dbxread.c
+++ b/gdb/dbxread.c
@@ -37,8 +37,8 @@
 #include "symtab.h"
 #include "breakpoint.h"
 #include "target.h"
-#include "gdbcore.h"		/* for bfd stuff */
-#include "libaout.h"		/* FIXME Secret internal BFD stuff for a.out */
+#include "gdbcore.h"
+#include "libaout.h"
 #include "filenames.h"
 #include "objfiles.h"
 #include "buildsym-legacy.h"
@@ -52,8 +52,7 @@
 #include "psymtab.h"
 #include "block.h"
 #include "aout/aout64.h"
-#include "aout/stab_gnu.h"	/* We always use GNU stabs, not
-				   native, now.  */
+#include "aout/stab_gnu.h"
 
 
 /* Key for dbx-associated data.  */
diff --git a/gdb/dcache.h b/gdb/dcache.h
index 1bc42ac7840..32c13063bd2 100644
--- a/gdb/dcache.h
+++ b/gdb/dcache.h
@@ -21,7 +21,7 @@
 #ifndef DCACHE_H
 #define DCACHE_H
 
-#include "target.h"	/* for enum target_xfer_status */
+#include "target.h"
 
 typedef struct dcache_struct DCACHE;
 
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index 0f4d99109fb..0a09ee74458 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -54,7 +54,7 @@
 #include "dwarf2.h"
 #include "demangle.h"
 #include "gdb-demangle.h"
-#include "filenames.h"	/* for DOSish file names */
+#include "filenames.h"
 #include "language.h"
 #include "complaints.h"
 #include "dwarf2/expr.h"
@@ -69,7 +69,7 @@
 #include "c-lang.h"
 #include "go-lang.h"
 #include "valprint.h"
-#include "gdbcore.h" /* for gnutarget */
+#include "gdbcore.h"
 #include "gdb/gdb-index.h"
 #include "gdb_bfd.h"
 #include "f-lang.h"
diff --git a/gdb/elf-none-tdep.c b/gdb/elf-none-tdep.c
index 460f02e7dbb..ce2db02aa9d 100644
--- a/gdb/elf-none-tdep.c
+++ b/gdb/elf-none-tdep.c
@@ -21,7 +21,7 @@
 #include "defs.h"
 #include "elf-none-tdep.h"
 #include "regset.h"
-#include "elf-bfd.h"            /* for elfcore_write_* */
+#include "elf-bfd.h"
 #include "inferior.h"
 #include "regcache.h"
 #include "gdbarch.h"
diff --git a/gdb/eval.c b/gdb/eval.c
index 794698f85bd..b859e825925 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -25,7 +25,7 @@
 #include "target.h"
 #include "frame.h"
 #include "gdbthread.h"
-#include "language.h"		/* For CAST_IS_CONVERSION.  */
+#include "language.h"
 #include "cp-abi.h"
 #include "infcall.h"
 #include "objc-lang.h"
diff --git a/gdb/event-top.c b/gdb/event-top.c
index d1be23bcbe9..3d6fa896a9c 100644
--- a/gdb/event-top.c
+++ b/gdb/event-top.c
@@ -30,11 +30,11 @@
 #include "event-top.h"
 #include "interps.h"
 #include <signal.h>
-#include "cli/cli-script.h"     /* for reset_command_nest_depth */
+#include "cli/cli-script.h"
 #include "main.h"
 #include "gdbthread.h"
 #include "observable.h"
-#include "gdbcmd.h"		/* for dont_repeat() */
+#include "gdbcmd.h"
 #include "annotate.h"
 #include "maint.h"
 #include "ser-event.h"
diff --git a/gdb/expprint.c b/gdb/expprint.c
index b996c9faf8b..c5b42b7a08a 100644
--- a/gdb/expprint.c
+++ b/gdb/expprint.c
@@ -24,7 +24,7 @@
 #include "value.h"
 #include "language.h"
 #include "parser-defs.h"
-#include "user-regs.h"		/* For user_reg_map_regnum_to_name.  */
+#include "user-regs.h"
 #include "target.h"
 #include "block.h"
 #include "objfiles.h"
diff --git a/gdb/extension.h b/gdb/extension.h
index 2b0445133d3..28f9e3bc028 100644
--- a/gdb/extension.h
+++ b/gdb/extension.h
@@ -20,7 +20,7 @@
 #ifndef EXTENSION_H
 #define EXTENSION_H
 
-#include "mi/mi-cmds.h" /* For PRINT_NO_VALUES, etc.  */
+#include "mi/mi-cmds.h"
 #include "gdbsupport/array-view.h"
 #include "gdbsupport/gdb_optional.h"
 
diff --git a/gdb/findvar.c b/gdb/findvar.c
index 1b7aa22888c..4e992ecdcc7 100644
--- a/gdb/findvar.c
+++ b/gdb/findvar.c
@@ -25,7 +25,7 @@
 #include "gdbcore.h"
 #include "inferior.h"
 #include "target.h"
-#include "symfile.h"		/* for overlay functions */
+#include "symfile.h"
 #include "regcache.h"
 #include "user-regs.h"
 #include "block.h"
diff --git a/gdb/frame-unwind.h b/gdb/frame-unwind.h
index 94e055d9fab..4a62906b570 100644
--- a/gdb/frame-unwind.h
+++ b/gdb/frame-unwind.h
@@ -28,7 +28,7 @@ struct gdbarch;
 struct regcache;
 struct value;
 
-#include "frame.h"		/* For enum frame_type.  */
+#include "frame.h"
 
 /* The following unwind functions assume a chain of frames forming the
    sequence: (outer) prev <-> this <-> next (inner).  All the
diff --git a/gdb/frame.c b/gdb/frame.c
index f42cf1a37d1..7077016ccba 100644
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -21,7 +21,7 @@
 #include "frame.h"
 #include "target.h"
 #include "value.h"
-#include "inferior.h"	/* for inferior_ptid */
+#include "inferior.h"
 #include "regcache.h"
 #include "user-regs.h"
 #include "gdbsupport/gdb_obstack.h"
diff --git a/gdb/frv-tdep.c b/gdb/frv-tdep.c
index 273a5bd7180..3656f6fcb66 100644
--- a/gdb/frv-tdep.c
+++ b/gdb/frv-tdep.c
@@ -42,7 +42,7 @@
 /* Make cgen names unique to prevent ODR conflicts with other targets.  */
 #define GDB_CGEN_REMAP_PREFIX frv
 #include "cgen-remap.h"
-#include "opcodes/frv-desc.h"	/* for the H_SPR_... enums */
+#include "opcodes/frv-desc.h"
 
 struct frv_unwind_cache		/* was struct frame_extra_info */
   {
diff --git a/gdb/gdb-demangle.c b/gdb/gdb-demangle.c
index 4bcdd981d97..b2053b8e021 100644
--- a/gdb/gdb-demangle.c
+++ b/gdb/gdb-demangle.c
@@ -24,7 +24,7 @@
    to a styles of demangling, and GDB specific.  */
 
 #include "defs.h"
-#include "cli/cli-utils.h" /* for skip_to_space */
+#include "cli/cli-utils.h"
 #include "command.h"
 #include "gdbcmd.h"
 #include "demangle.h"
diff --git a/gdb/guile/guile-internal.h b/gdb/guile/guile-internal.h
index b04ef17a5ad..c0f1410ed7c 100644
--- a/gdb/guile/guile-internal.h
+++ b/gdb/guile/guile-internal.h
@@ -29,7 +29,7 @@
 #include "symtab.h"
 #include "libguile.h"
 #include "objfiles.h"
-#include "top.h"		/* For quit_force().  */
+#include "top.h"
 
 struct block;
 struct frame_info;
diff --git a/gdb/guile/scm-disasm.c b/gdb/guile/scm-disasm.c
index 58ccb4f497e..9169b4a5c6d 100644
--- a/gdb/guile/scm-disasm.c
+++ b/gdb/guile/scm-disasm.c
@@ -25,7 +25,7 @@
 #include "disasm.h"
 #include "dis-asm.h"
 #include "gdbarch.h"
-#include "gdbcore.h" /* Why is memory_error here? */
+#include "gdbcore.h"
 #include "guile-internal.h"
 
 static SCM port_keyword;
diff --git a/gdb/guile/scm-math.c b/gdb/guile/scm-math.c
index 32595cf0a68..809bff1ff82 100644
--- a/gdb/guile/scm-math.c
+++ b/gdb/guile/scm-math.c
@@ -25,7 +25,7 @@
 #include "charset.h"
 #include "cp-abi.h"
 #include "target-float.h"
-#include "symtab.h" /* Needed by language.h.  */
+#include "symtab.h"
 #include "language.h"
 #include "valprint.h"
 #include "value.h"
diff --git a/gdb/guile/scm-pretty-print.c b/gdb/guile/scm-pretty-print.c
index ae56758b2bc..2870e14e3b0 100644
--- a/gdb/guile/scm-pretty-print.c
+++ b/gdb/guile/scm-pretty-print.c
@@ -21,9 +21,9 @@
    conventions, et.al.  */
 
 #include "defs.h"
-#include "top.h"		/* For quit_force().  */
+#include "top.h"
 #include "charset.h"
-#include "symtab.h" /* Needed by language.h.  */
+#include "symtab.h"
 #include "language.h"
 #include "objfiles.h"
 #include "value.h"
diff --git a/gdb/guile/scm-type.c b/gdb/guile/scm-type.c
index 3b0a2752418..8502cb60a61 100644
--- a/gdb/guile/scm-type.c
+++ b/gdb/guile/scm-type.c
@@ -21,7 +21,7 @@
    conventions, et.al.  */
 
 #include "defs.h"
-#include "top.h"		/* For quit_force().  */
+#include "top.h"
 #include "arch-utils.h"
 #include "value.h"
 #include "gdbtypes.h"
diff --git a/gdb/guile/scm-value.c b/gdb/guile/scm-value.c
index 6f325db97ca..e58e132f76a 100644
--- a/gdb/guile/scm-value.c
+++ b/gdb/guile/scm-value.c
@@ -21,13 +21,13 @@
    conventions, et.al.  */
 
 #include "defs.h"
-#include "top.h"		/* For quit_force().  */
+#include "top.h"
 #include "arch-utils.h"
 #include "charset.h"
 #include "cp-abi.h"
 #include "target-float.h"
 #include "infcall.h"
-#include "symtab.h" /* Needed by language.h.  */
+#include "symtab.h"
 #include "language.h"
 #include "valprint.h"
 #include "value.h"
diff --git a/gdb/ia64-tdep.c b/gdb/ia64-tdep.c
index 27da839e27d..cdd5553cf5d 100644
--- a/gdb/ia64-tdep.c
+++ b/gdb/ia64-tdep.c
@@ -31,7 +31,7 @@
 #include "target-float.h"
 #include "value.h"
 #include "objfiles.h"
-#include "elf/common.h"		/* for DT_PLTGOT value */
+#include "elf/common.h"
 #include "elf-bfd.h"
 #include "dis-asm.h"
 #include "infcall.h"
@@ -40,7 +40,7 @@
 #include "cp-abi.h"
 
 #ifdef HAVE_LIBUNWIND_IA64_H
-#include "elf/ia64.h"           /* for PT_IA_64_UNWIND value */
+#include "elf/ia64.h"
 #include "ia64-libunwind-tdep.h"
 
 /* Note: KERNEL_START is supposed to be an address which is not going
diff --git a/gdb/inf-loop.h b/gdb/inf-loop.h
index c2f6d6c43de..39713539bdc 100644
--- a/gdb/inf-loop.h
+++ b/gdb/inf-loop.h
@@ -20,7 +20,7 @@
 #ifndef INF_LOOP_H
 #define INF_LOOP_H
 
-#include "target.h"             /* For enum inferior_event_type.  */
+#include "target.h"
 
 extern void inferior_event_handler (enum inferior_event_type event_type);
 
diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index e58d67183b5..7e36ced6292 100644
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -39,13 +39,13 @@
 #include "inf-child.h"
 #include "inf-ptrace.h"
 #include "auxv.h"
-#include <sys/procfs.h>		/* for elf_gregset etc.  */
-#include "elf-bfd.h"		/* for elfcore_write_* */
-#include "gregset.h"		/* for gregset */
-#include "gdbcore.h"		/* for get_exec_file */
-#include <ctype.h>		/* for isdigit */
-#include <sys/stat.h>		/* for struct stat */
-#include <fcntl.h>		/* for O_RDONLY */
+#include <sys/procfs.h>
+#include "elf-bfd.h"
+#include "gregset.h"
+#include "gdbcore.h"
+#include <ctype.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 #include "inf-loop.h"
 #include "gdbsupport/event-loop.h"
 #include "event-top.h"
diff --git a/gdb/linux-tdep.c b/gdb/linux-tdep.c
index b5eee5e108c..22bb9686e8d 100644
--- a/gdb/linux-tdep.c
+++ b/gdb/linux-tdep.c
@@ -27,7 +27,7 @@
 #include "regcache.h"
 #include "regset.h"
 #include "elf/common.h"
-#include "elf-bfd.h"            /* for elfcore_write_* */
+#include "elf-bfd.h"
 #include "inferior.h"
 #include "cli/cli-utils.h"
 #include "arch-utils.h"
diff --git a/gdb/m2-typeprint.c b/gdb/m2-typeprint.c
index 9a4cb8d6b55..72f978205ab 100644
--- a/gdb/m2-typeprint.c
+++ b/gdb/m2-typeprint.c
@@ -19,7 +19,7 @@
 #include "defs.h"
 #include "language.h"
 #include "gdbsupport/gdb_obstack.h"
-#include "bfd.h"		/* Binary File Description */
+#include "bfd.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "expression.h"
diff --git a/gdb/maint.c b/gdb/maint.c
index 5d52dfafd06..f91184c2005 100644
--- a/gdb/maint.c
+++ b/gdb/maint.c
@@ -32,7 +32,7 @@
 #include "gdbtypes.h"
 #include "demangle.h"
 #include "gdbcore.h"
-#include "expression.h"		/* For language.h */
+#include "expression.h"
 #include "language.h"
 #include "symfile.h"
 #include "objfiles.h"
diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c
index 9cb30ce0acd..d4e8f261497 100644
--- a/gdb/mdebugread.c
+++ b/gdb/mdebugread.c
@@ -60,11 +60,11 @@
 
 #include "bfd.h"
 
-#include "coff/ecoff.h"		/* COFF-like aspects of ecoff files.  */
+#include "coff/ecoff.h"
 
-#include "libaout.h"		/* Private BFD a.out information.  */
+#include "libaout.h"
 #include "aout/aout64.h"
-#include "aout/stab_gnu.h"	/* STABS information.  */
+#include "aout/stab_gnu.h"
 
 #include "expression.h"
 
diff --git a/gdb/mdebugread.h b/gdb/mdebugread.h
index f014692bd21..efb96f25b65 100644
--- a/gdb/mdebugread.h
+++ b/gdb/mdebugread.h
@@ -20,7 +20,7 @@
 #ifndef MDEBUGREAD_H
 #define MDEBUGREAD_H
 
-#include "coff/sym.h"		/* Needed for PDR below.  */
+#include "coff/sym.h"
 #include "coff/symconst.h"
 
 /* Specific information about a procedure.  Architectures (ab)uses
diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index 8ea0d35f18a..4f18ef7db25 100644
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -36,7 +36,7 @@
 #include "interps.h"
 #include "gdbsupport/event-loop.h"
 #include "event-top.h"
-#include "gdbcore.h"		/* For write_memory().  */
+#include "gdbcore.h"
 #include "value.h"
 #include "regcache.h"
 #include "frame.h"
diff --git a/gdb/mi/mi-parse.h b/gdb/mi/mi-parse.h
index 4a41b305031..3d3e7307b33 100644
--- a/gdb/mi/mi-parse.h
+++ b/gdb/mi/mi-parse.h
@@ -22,7 +22,7 @@
 
 #include "gdbsupport/run-time-clock.h"
 #include <chrono>
-#include "mi-cmds.h"  /* For enum print_values.  */
+#include "mi-cmds.h"
 
 /* MI parser */
 
diff --git a/gdb/mipsread.c b/gdb/mipsread.c
index 447684154af..d8c12e054ba 100644
--- a/gdb/mipsread.c
+++ b/gdb/mipsread.c
@@ -33,8 +33,8 @@
 #include "coff/sym.h"
 #include "coff/internal.h"
 #include "coff/ecoff.h"
-#include "libcoff.h"		/* Private BFD COFF information.  */
-#include "libecoff.h"		/* Private BFD ECOFF information.  */
+#include "libcoff.h"
+#include "libecoff.h"
 #include "elf/common.h"
 #include "elf/internal.h"
 #include "elf/mips.h"
diff --git a/gdb/mn10300-tdep.c b/gdb/mn10300-tdep.c
index f52b6990a60..84fbf415ea6 100644
--- a/gdb/mn10300-tdep.c
+++ b/gdb/mn10300-tdep.c
@@ -22,7 +22,7 @@
 #include "dis-asm.h"
 #include "gdbtypes.h"
 #include "regcache.h"
-#include "gdbcore.h"	/* For write_memory_unsigned_integer.  */
+#include "gdbcore.h"
 #include "value.h"
 #include "frame.h"
 #include "frame-unwind.h"
diff --git a/gdb/nat/aarch64-linux-hw-point.h b/gdb/nat/aarch64-linux-hw-point.h
index 83a0a097f8b..d155144c342 100644
--- a/gdb/nat/aarch64-linux-hw-point.h
+++ b/gdb/nat/aarch64-linux-hw-point.h
@@ -19,7 +19,7 @@
 #ifndef NAT_AARCH64_LINUX_HW_POINT_H
 #define NAT_AARCH64_LINUX_HW_POINT_H
 
-#include "gdbsupport/break-common.h" /* For enum target_hw_bp_type.  */
+#include "gdbsupport/break-common.h"
 
 #include "nat/aarch64-hw-point.h"
 
diff --git a/gdb/nat/amd64-linux-siginfo.h b/gdb/nat/amd64-linux-siginfo.h
index 498cb2ec2bc..3f6299160fb 100644
--- a/gdb/nat/amd64-linux-siginfo.h
+++ b/gdb/nat/amd64-linux-siginfo.h
@@ -20,7 +20,7 @@
 #ifndef NAT_AMD64_LINUX_SIGINFO_H
 #define NAT_AMD64_LINUX_SIGINFO_H
 
-#include <signal.h>  /* For siginfo_t.  */
+#include <signal.h>
 
 /* When GDB is built as a 64-bit application on Linux, the
    PTRACE_GETSIGINFO data is always presented in 64-bit layout.  Since
diff --git a/gdb/nat/x86-dregs.h b/gdb/nat/x86-dregs.h
index 093a234bc20..21a23be3f89 100644
--- a/gdb/nat/x86-dregs.h
+++ b/gdb/nat/x86-dregs.h
@@ -33,7 +33,7 @@
    (32 bytes on 64 bit hosts).  */
 
 
-#include "gdbsupport/break-common.h" /* target_hw_bp_type */
+#include "gdbsupport/break-common.h"
 
 /* Low-level function vector.  */
 
diff --git a/gdb/objfiles.c b/gdb/objfiles.c
index 222fa89ca97..8f085b1bb7c 100644
--- a/gdb/objfiles.c
+++ b/gdb/objfiles.c
@@ -23,7 +23,7 @@
    destroying objfile structures.  */
 
 #include "defs.h"
-#include "bfd.h"		/* Binary File Description */
+#include "bfd.h"
 #include "symtab.h"
 #include "symfile.h"
 #include "objfiles.h"
diff --git a/gdb/objfiles.h b/gdb/objfiles.h
index b3b216f6177..4b8aa9bfcec 100644
--- a/gdb/objfiles.h
+++ b/gdb/objfiles.h
@@ -21,7 +21,7 @@
 #define OBJFILES_H
 
 #include "hashtab.h"
-#include "gdbsupport/gdb_obstack.h"	/* For obstack internals.  */
+#include "gdbsupport/gdb_obstack.h"
 #include "objfile-flags.h"
 #include "symfile.h"
 #include "progspace.h"
diff --git a/gdb/p-typeprint.c b/gdb/p-typeprint.c
index 54ff9661220..41058a8b59e 100644
--- a/gdb/p-typeprint.c
+++ b/gdb/p-typeprint.c
@@ -20,7 +20,7 @@
 
 #include "defs.h"
 #include "gdbsupport/gdb_obstack.h"
-#include "bfd.h"		/* Binary File Description */
+#include "bfd.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "expression.h"
diff --git a/gdb/parse.c b/gdb/parse.c
index 221733a3f90..c69b53addff 100644
--- a/gdb/parse.c
+++ b/gdb/parse.c
@@ -41,7 +41,7 @@
 #include "language.h"
 #include "parser-defs.h"
 #include "gdbcmd.h"
-#include "symfile.h"		/* for overlay functions */
+#include "symfile.h"
 #include "inferior.h"
 #include "target-float.h"
 #include "block.h"
diff --git a/gdb/ppc-linux-tdep.h b/gdb/ppc-linux-tdep.h
index af70c7a4b1e..39e60875d97 100644
--- a/gdb/ppc-linux-tdep.h
+++ b/gdb/ppc-linux-tdep.h
@@ -20,7 +20,7 @@
 #ifndef PPC_LINUX_TDEP_H
 #define PPC_LINUX_TDEP_H
 
-#include "ppc-tdep.h"  /* For PPC_NUM_REGS.  */
+#include "ppc-tdep.h"
 
 struct regset;
 
diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index 8d7d04231fe..7e5f062caec 100644
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -33,9 +33,9 @@
 #include "gdb-demangle.h"
 #include "valprint.h"
 #include "annotate.h"
-#include "symfile.h"		/* for overlay functions */
-#include "objfiles.h"		/* ditto */
-#include "completer.h"		/* for completion functions */
+#include "symfile.h"
+#include "objfiles.h"
+#include "completer.h"
 #include "ui-out.h"
 #include "block.h"
 #include "disasm.h"
diff --git a/gdb/proc-api.c b/gdb/proc-api.c
index addda6dd647..8e567c7fec4 100644
--- a/gdb/proc-api.c
+++ b/gdb/proc-api.c
@@ -30,9 +30,9 @@
 
 #include <sys/types.h>
 #include <sys/procfs.h>
-#include <sys/proc.h>	/* for struct proc */
-#include <sys/user.h>	/* for struct user */
-#include <fcntl.h>	/* for O_RDWR etc.  */
+#include <sys/proc.h>
+#include <sys/user.h>
+#include <fcntl.h>
 #include "gdbsupport/gdb_wait.h"
 
 #include "proc-utils.h"
diff --git a/gdb/procfs.c b/gdb/procfs.c
index d55a16a9fb5..9443b074483 100644
--- a/gdb/procfs.c
+++ b/gdb/procfs.c
@@ -25,7 +25,7 @@
 #include "infrun.h"
 #include "target.h"
 #include "gdbcore.h"
-#include "elf-bfd.h"		/* for elfcore_write_* */
+#include "elf-bfd.h"
 #include "gdbcmd.h"
 #include "gdbthread.h"
 #include "regcache.h"
@@ -66,11 +66,11 @@
    interface.  */
 
 #include <sys/types.h>
-#include <dirent.h>	/* opendir/readdir, for listing the LWP's */
+#include <dirent.h>
 
-#include <fcntl.h>	/* for O_RDONLY */
-#include <unistd.h>	/* for "X_OK" */
-#include <sys/stat.h>	/* for struct stat */
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/stat.h>
 
 /* Note: procfs-utils.h must be included after the above system header
    files, because it redefines various system calls using macros.
diff --git a/gdb/python/py-finishbreakpoint.c b/gdb/python/py-finishbreakpoint.c
index fa2139ba5d2..42a7e0706d2 100644
--- a/gdb/python/py-finishbreakpoint.c
+++ b/gdb/python/py-finishbreakpoint.c
@@ -20,7 +20,7 @@
 
 
 #include "defs.h"
-#include "top.h"		/* For quit_force().  */
+#include "top.h"
 #include "python-internal.h"
 #include "breakpoint.h"
 #include "frame.h"
diff --git a/gdb/python/py-symbol.c b/gdb/python/py-symbol.c
index 43a20c7a366..99724cfc95b 100644
--- a/gdb/python/py-symbol.c
+++ b/gdb/python/py-symbol.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "top.h"		/* For force_quit ().  */
+#include "top.h"
 #include "block.h"
 #include "frame.h"
 #include "symtab.h"
diff --git a/gdb/python/py-utils.c b/gdb/python/py-utils.c
index d5b07a80d82..15520849f15 100644
--- a/gdb/python/py-utils.c
+++ b/gdb/python/py-utils.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "top.h"		/* For quit_force ().  */
+#include "top.h"
 #include "charset.h"
 #include "value.h"
 #include "python-internal.h"
diff --git a/gdb/python/py-value.c b/gdb/python/py-value.c
index ee492fd9af6..245de68e0b9 100644
--- a/gdb/python/py-value.c
+++ b/gdb/python/py-value.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "top.h"		/* For quit_force ().  */
+#include "top.h"
 #include "charset.h"
 #include "value.h"
 #include "language.h"
diff --git a/gdb/record.h b/gdb/record.h
index 166b5349988..c030847ea70 100644
--- a/gdb/record.h
+++ b/gdb/record.h
@@ -20,7 +20,7 @@
 #ifndef RECORD_H
 #define RECORD_H
 
-#include "target/waitstatus.h" /* For enum target_stop_reason.  */
+#include "target/waitstatus.h"
 #include "gdbsupport/enum-flags.h"
 
 struct address_space;
diff --git a/gdb/reggroups.c b/gdb/reggroups.c
index 744e7bde41b..fd300e85796 100644
--- a/gdb/reggroups.c
+++ b/gdb/reggroups.c
@@ -25,7 +25,7 @@
 #include "gdbtypes.h"
 #include "regcache.h"
 #include "command.h"
-#include "gdbcmd.h"		/* For maintenanceprintlist.  */
+#include "gdbcmd.h"
 #include "gdbsupport/gdb_obstack.h"
 
 /* See reggroups.h.  */
diff --git a/gdb/remote-fileio.c b/gdb/remote-fileio.c
index 69b409708a3..10bc86c1ba5 100644
--- a/gdb/remote-fileio.c
+++ b/gdb/remote-fileio.c
@@ -33,7 +33,7 @@
 #include <fcntl.h>
 #include "gdbsupport/gdb_sys_time.h"
 #ifdef __CYGWIN__
-#include <sys/cygwin.h>		/* For cygwin_conv_path.  */
+#include <sys/cygwin.h>
 #endif
 #include <signal.h>
 
diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index 71390513ad2..23397d037ae 100644
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -43,8 +43,8 @@
 #include "record-full.h"
 #include "auxv.h"
 
-#include "coff/internal.h"	/* for libcoff.h */
-#include "libcoff.h"		/* for xcoff_data */
+#include "coff/internal.h"
+#include "libcoff.h"
 #include "coff/xcoff.h"
 #include "libxcoff.h"
 
diff --git a/gdb/ser-base.h b/gdb/ser-base.h
index 4c6537f7adf..27f9f343977 100644
--- a/gdb/ser-base.h
+++ b/gdb/ser-base.h
@@ -20,7 +20,7 @@
 #ifndef SER_BASE_H
 #define SER_BASE_H
 
-#include "serial.h"  /* For serial_ttystate.  */
+#include "serial.h"
 
 struct serial;
 struct ui_file;
diff --git a/gdb/ser-tcp.c b/gdb/ser-tcp.c
index 6083bd61e62..0367a5ac65b 100644
--- a/gdb/ser-tcp.c
+++ b/gdb/ser-tcp.c
@@ -30,10 +30,10 @@
 #include <sys/types.h>
 
 #ifdef HAVE_SYS_FILIO_H
-#include <sys/filio.h>  /* For FIONBIO.  */
+#include <sys/filio.h>
 #endif
 #ifdef HAVE_SYS_IOCTL_H
-#include <sys/ioctl.h>  /* For FIONBIO.  */
+#include <sys/ioctl.h>
 #endif
 
 #include "gdbsupport/gdb_sys_time.h"
diff --git a/gdb/skip.c b/gdb/skip.c
index f3b1bec9e4c..28902a6d326 100644
--- a/gdb/skip.c
+++ b/gdb/skip.c
@@ -29,7 +29,7 @@
 #include "arch-utils.h"
 #include "linespec.h"
 #include "objfiles.h"
-#include "breakpoint.h" /* for get_sal_arch () */
+#include "breakpoint.h"
 #include "source.h"
 #include "filenames.h"
 #include "fnmatch.h"
diff --git a/gdb/solib.c b/gdb/solib.c
index 4f980e9365c..771954e51c8 100644
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -38,7 +38,7 @@
 #include "completer.h"
 #include "elf/external.h"
 #include "elf/common.h"
-#include "filenames.h"		/* for DOSish file names */
+#include "filenames.h"
 #include "exec.h"
 #include "solist.h"
 #include "observable.h"
diff --git a/gdb/source.c b/gdb/source.c
index 08adc6671b7..9c701e866a6 100644
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -37,7 +37,7 @@
 #include "annotate.h"
 #include "gdbtypes.h"
 #include "linespec.h"
-#include "filenames.h"		/* for DOSish file names */
+#include "filenames.h"
 #include "completer.h"
 #include "ui-out.h"
 #include "readline/tilde.h"
diff --git a/gdb/stabsread.c b/gdb/stabsread.c
index cc7efda61bf..19a136664db 100644
--- a/gdb/stabsread.c
+++ b/gdb/stabsread.c
@@ -32,7 +32,7 @@
 #include "expression.h"
 #include "symfile.h"
 #include "objfiles.h"
-#include "aout/stab_gnu.h"	/* We always use GNU stabs, not native.  */
+#include "aout/stab_gnu.h"
 #include "libaout.h"
 #include "aout/aout64.h"
 #include "gdb-stabs.h"
diff --git a/gdb/stubs/m32r-stub.c b/gdb/stubs/m32r-stub.c
index 90754e31364..1f55f85e681 100644
--- a/gdb/stubs/m32r-stub.c
+++ b/gdb/stubs/m32r-stub.c
@@ -168,7 +168,7 @@ static volatile int mem_err = 0;
 int gdb_m32r_vector = -1;
 
 #if 0
-#include "syscall.h"		/* for SYS_exit, SYS_write etc. */
+#include "syscall.h"
 #endif
 
 /* Global entry points:
diff --git a/gdb/symfile.c b/gdb/symfile.c
index 85a9c4e1da0..76b5e1b8fe7 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -38,7 +38,7 @@
 #include "demangle.h"
 #include "inferior.h"
 #include "regcache.h"
-#include "filenames.h"		/* for DOSish file names */
+#include "filenames.h"
 #include "gdbsupport/gdb_obstack.h"
 #include "completer.h"
 #include "bcache.h"
diff --git a/gdb/symtab.c b/gdb/symtab.c
index c0c2454d967..66d073e3b7b 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -34,7 +34,7 @@
 #include "demangle.h"
 #include "inferior.h"
 #include "source.h"
-#include "filenames.h"		/* for FILENAME_CMP */
+#include "filenames.h"
 #include "objc-lang.h"
 #include "d-lang.h"
 #include "ada-lang.h"
diff --git a/gdb/target-descriptions.c b/gdb/target-descriptions.c
index cdedf88c793..9f6e8d2f1ac 100644
--- a/gdb/target-descriptions.c
+++ b/gdb/target-descriptions.c
@@ -35,7 +35,7 @@
 #include "inferior.h"
 #include <algorithm>
 #include "completer.h"
-#include "readline/tilde.h" /* tilde_expand */
+#include "readline/tilde.h"
 
 /* Types.  */
 
diff --git a/gdb/target.h b/gdb/target.h
index 6e6aa5f8fb3..936ae79219c 100644
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -43,8 +43,8 @@ struct inferior;
    make-target-delegates.py to parse.  */
 typedef const gdb_byte const_gdb_byte;
 
-#include "infrun.h" /* For enum exec_direction_kind.  */
-#include "breakpoint.h" /* For enum bptype.  */
+#include "infrun.h"
+#include "breakpoint.h"
 #include "gdbsupport/scoped_restore.h"
 #include "gdbsupport/refcounted-object.h"
 #include "target-section.h"
@@ -88,7 +88,7 @@ typedef const gdb_byte const_gdb_byte;
 #include "gdbsupport/fileio.h"
 #include "gdbsupport/x86-xstate.h"
 
-#include "gdbsupport/break-common.h" /* For enum target_hw_bp_type.  */
+#include "gdbsupport/break-common.h"
 
 enum strata
   {
diff --git a/gdb/thread-fsm.h b/gdb/thread-fsm.h
index 3720c3098fa..26370904828 100644
--- a/gdb/thread-fsm.h
+++ b/gdb/thread-fsm.h
@@ -19,7 +19,7 @@
 #ifndef THREAD_FSM_H
 #define THREAD_FSM_H
 
-#include "mi/mi-common.h" /* For enum async_reply_reason.  */
+#include "mi/mi-common.h"
 
 struct return_value_info;
 struct thread_fsm_ops;
diff --git a/gdb/tracefile-tfile.c b/gdb/tracefile-tfile.c
index 815f13f9846..478f2f0a13a 100644
--- a/gdb/tracefile-tfile.c
+++ b/gdb/tracefile-tfile.c
@@ -21,7 +21,7 @@
 #include "tracefile.h"
 #include "readline/tilde.h"
 #include "gdbsupport/filestuff.h"
-#include "gdbsupport/rsp-low.h" /* bin2hex */
+#include "gdbsupport/rsp-low.h"
 #include "regcache.h"
 #include "inferior.h"
 #include "gdbthread.h"
diff --git a/gdb/trad-frame.h b/gdb/trad-frame.h
index d6f6e4dcf73..9211436e001 100644
--- a/gdb/trad-frame.h
+++ b/gdb/trad-frame.h
@@ -20,7 +20,7 @@
 #ifndef TRAD_FRAME_H
 #define TRAD_FRAME_H
 
-#include "frame.h"		/* For "struct frame_id".  */
+#include "frame.h"
 
 class frame_info_ptr;
 struct regcache_map_entry;
diff --git a/gdb/tramp-frame.h b/gdb/tramp-frame.h
index fa0241acb2d..a8e4ab6dd48 100644
--- a/gdb/tramp-frame.h
+++ b/gdb/tramp-frame.h
@@ -20,7 +20,7 @@
 #ifndef TRAMP_FRAME_H
 #define TRAMP_FRAME_H
 
-#include "frame.h"		/* For "enum frame_type".  */
+#include "frame.h"
 
 class frame_info_ptr;
 struct trad_frame_cache;
diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h
index d0e8d56fa07..a1e44f77cc1 100644
--- a/gdb/tui/tui-data.h
+++ b/gdb/tui/tui-data.h
@@ -23,7 +23,7 @@
 #define TUI_TUI_DATA_H
 
 #include "tui/tui.h"
-#include "gdb_curses.h"	/* For WINDOW.  */
+#include "gdb_curses.h"
 #include "observable.h"
 
 /* A deleter that calls delwin.  */
diff --git a/gdb/tui/tui-location.h b/gdb/tui/tui-location.h
index 8e1d5da1191..514d2da5b8f 100644
--- a/gdb/tui/tui-location.h
+++ b/gdb/tui/tui-location.h
@@ -20,7 +20,7 @@
 
 #include "tui/tui.h"
 #include "tui/tui.h"
-#include "gdb_curses.h"	/* For WINDOW.  */
+#include "gdb_curses.h"
 #include "observable.h"
 
 /* Class used to track the current location that the TUI is displaying.  An
diff --git a/gdb/typeprint.c b/gdb/typeprint.c
index 259ff132142..a1001a755ad 100644
--- a/gdb/typeprint.c
+++ b/gdb/typeprint.c
@@ -19,7 +19,7 @@
 
 #include "defs.h"
 #include "gdbsupport/gdb_obstack.h"
-#include "bfd.h"		/* Binary File Description */
+#include "bfd.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "expression.h"
diff --git a/gdb/ui-out.c b/gdb/ui-out.c
index b4b8e486cb8..defa8f9dfa4 100644
--- a/gdb/ui-out.c
+++ b/gdb/ui-out.c
@@ -21,7 +21,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "expression.h"		/* For language.h */
+#include "expression.h"
 #include "language.h"
 #include "ui-out.h"
 #include "gdbsupport/format.h"
diff --git a/gdb/utils.c b/gdb/utils.c
index cacd6cbd23e..2f545337cd4 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -56,7 +56,7 @@
 #include "main.h"
 #include "solist.h"
 
-#include "inferior.h"		/* for signed_pointer_to_address */
+#include "inferior.h"
 
 #include "gdb_curses.h"
 
diff --git a/gdb/value.h b/gdb/value.h
index 1d5a0018f92..e4912717684 100644
--- a/gdb/value.h
+++ b/gdb/value.h
@@ -20,7 +20,7 @@
 #if !defined (VALUE_H)
 #define VALUE_H 1
 
-#include "frame.h"		/* For struct frame_id.  */
+#include "frame.h"
 #include "extension.h"
 #include "gdbsupport/gdb_ref_ptr.h"
 #include "gmp-utils.h"
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index d8b33452f46..5a897dbfe76 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -22,7 +22,7 @@
 /* Originally by Steve Chamberlain, sac@cygnus.com */
 
 #include "defs.h"
-#include "frame.h"		/* required by inferior.h */
+#include "frame.h"
 #include "inferior.h"
 #include "infrun.h"
 #include "target.h"
diff --git a/gdb/x86-linux-nat.h b/gdb/x86-linux-nat.h
index a99de6c29ea..a0f8ffc993e 100644
--- a/gdb/x86-linux-nat.h
+++ b/gdb/x86-linux-nat.h
@@ -20,7 +20,7 @@
 #ifndef X86_LINUX_NAT_H
 #define X86_LINUX_NAT_H 1
 
-#include "gdb_proc_service.h"  /* For ps_err_e.  */
+#include "gdb_proc_service.h"
 #include "linux-nat.h"
 #include "gdbsupport/x86-xstate.h"
 #include "x86-nat.h"
diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c
index 427029dd442..e6ecf2a6de5 100644
--- a/gdb/xcoffread.c
+++ b/gdb/xcoffread.c
@@ -31,7 +31,7 @@
 #include <algorithm>
 
 #include "coff/internal.h"
-#include "libcoff.h"		/* FIXME, internal data from BFD */
+#include "libcoff.h"
 #include "coff/xcoff.h"
 #include "libxcoff.h"
 #include "coff/rs6000.h"
diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h
index 6dc93197f5c..f7cedf6706b 100644
--- a/gdbserver/linux-low.h
+++ b/gdbserver/linux-low.h
@@ -28,7 +28,7 @@
 
 /* Included for ptrace type definitions.  */
 #include "nat/linux-ptrace.h"
-#include "target/waitstatus.h" /* For enum target_stop_reason.  */
+#include "target/waitstatus.h"
 #include "tracepoint.h"
 
 #include <list>
diff --git a/gdbserver/target.h b/gdbserver/target.h
index d993e361b76..f13ee40489f 100644
--- a/gdbserver/target.h
+++ b/gdbserver/target.h
@@ -21,7 +21,7 @@
 #ifndef GDBSERVER_TARGET_H
 #define GDBSERVER_TARGET_H
 
-#include <sys/types.h> /* for mode_t */
+#include <sys/types.h>
 #include "target/target.h"
 #include "target/resume.h"
 #include "target/wait.h"
diff --git a/gdbsupport/common-defs.h b/gdbsupport/common-defs.h
index 72c1c5144f3..5e8ebab620c 100644
--- a/gdbsupport/common-defs.h
+++ b/gdbsupport/common-defs.h
@@ -96,7 +96,7 @@
 #include <stdint.h>
 #include <string.h>
 #ifdef HAVE_STRINGS_H
-#include <strings.h>	/* for strcasecmp and strncasecmp */
+#include <strings.h>
 #endif
 #include <errno.h>
 #if HAVE_ALLOCA_H
diff --git a/gdbsupport/gdb_wait.h b/gdbsupport/gdb_wait.h
index f8d44c98e1b..d1f9ccdd39b 100644
--- a/gdbsupport/gdb_wait.h
+++ b/gdbsupport/gdb_wait.h
@@ -20,10 +20,10 @@
 #define COMMON_GDB_WAIT_H
 
 #ifdef HAVE_SYS_WAIT_H
-#include <sys/wait.h> /* POSIX */
+#include <sys/wait.h>
 #else
 #ifdef HAVE_WAIT_H
-#include <wait.h> /* legacy */
+#include <wait.h>
 #endif
 #endif
 
