1 files changed, 31 insertions, 22 deletions

diff --git a/gdb/source.c b/gdb/source.c
index f99215f9810..1e187489909 100644
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -17,35 +17,44 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "arch-utils.h"
-#include "symtab.h"
-#include "expression.h"
-#include "language.h"
-#include "command.h"
 #include "source.h"
-#include "gdbcmd.h"
-#include "frame.h"
-#include "value.h"
-#include "common/filestuff.h"
 
-#include <sys/types.h>
+/* Standard C includes.  */
 #include <fcntl.h>
-#include "gdbcore.h"
-#include "gdb_regex.h"
-#include "symfile.h"
-#include "objfiles.h"
-#include "annotate.h"
-#include "gdbtypes.h"
-#include "linespec.h"
-#include "filenames.h"		/* for DOSish file names */
-#include "completer.h"
-#include "ui-out.h"
+#include <sys/types.h>
+
+/* Standard C++ includes.  */
+#include <algorithm>
+
+/* Local non-gdb includes.  */
+#include "filenames.h"
 #include "readline/readline.h"
+
+/* Local subdirectory includes.  */
 #include "common/enum-flags.h"
-#include "common/scoped_fd.h"
-#include <algorithm>
+#include "common/filestuff.h"
 #include "common/pathstuff.h"
+#include "common/scoped_fd.h"
+
+/* Local includes.  */
+#include "annotate.h"
+#include "arch-utils.h"
+#include "command.h"
+#include "completer.h"
+#include "expression.h"
+#include "frame.h"
+#include "gdb_regex.h"
+#include "gdbcmd.h"
+#include "gdbcore.h"
+#include "gdbtypes.h"
+#include "language.h"
+#include "linespec.h"
+#include "objfiles.h"
 #include "source-cache.h"
+#include "symfile.h"
+#include "symtab.h"
+#include "ui-out.h"
+#include "value.h"
 
 #define OPEN_MODE (O_RDONLY | O_BINARY)
 #define FDOPEN_MODE FOPEN_RB