1 files changed, 39 insertions, 34 deletions

diff --git a/gdb/darwin-nat.c b/gdb/darwin-nat.c
index 6247b0656c9..65e93fec040 100644
--- a/gdb/darwin-nat.c
+++ b/gdb/darwin-nat.c
@@ -19,56 +19,61 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "top.h"
-#include "inferior.h"
-#include "target.h"
-#include "symfile.h"
-#include "symtab.h"
-#include "objfiles.h"
-#include "gdbcmd.h"
-#include "gdbcore.h"
-#include "gdbthread.h"
-#include "regcache.h"
-#include "event-top.h"
-#include "inf-loop.h"
-#include <sys/stat.h>
-#include "inf-child.h"
-#include "value.h"
-#include "arch-utils.h"
-#include "bfd.h"
-#include "bfd/mach-o.h"
+#include "darwin-nat.h"
 
+/* Standard C includes.  */
 #include <copyfile.h>
-#include <sys/ptrace.h>
-#include <sys/signal.h>
-#include <setjmp.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <signal.h>
 #include <ctype.h>
-#include <sys/sysctl.h>
-#include <sys/proc.h>
 #include <libproc.h>
-#include <sys/syscall.h>
-#include <spawn.h>
-
 #include <mach/mach_error.h>
-#include <mach/mach_vm.h>
 #include <mach/mach_init.h>
-#include <mach/vm_map.h>
-#include <mach/task.h>
 #include <mach/mach_port.h>
-#include <mach/thread_act.h>
+#include <mach/mach_vm.h>
 #include <mach/port.h>
+#include <mach/task.h>
+#include <mach/thread_act.h>
+#include <mach/vm_map.h>
+#include <setjmp.h>
+#include <signal.h>
+#include <spawn.h>
+#include <sys/proc.h>
+#include <sys/ptrace.h>
+#include <sys/signal.h>
+#include <sys/stat.h>
+#include <sys/syscall.h>
+#include <sys/sysctl.h>
+#include <sys/types.h>
+#include <unistd.h>
 
-#include "darwin-nat.h"
+/* Local non-gdb includes.  */
+#include "bfd.h"
+#include "bfd/mach-o.h"
 #include "filenames.h"
+
+/* Local subdirectory includes.  */
 #include "common/filestuff.h"
 #include "common/gdb_unlinker.h"
 #include "common/pathstuff.h"
 #include "common/scoped_fd.h"
 #include "nat/fork-inferior.h"
 
+/* Local includes.  */
+#include "arch-utils.h"
+#include "event-top.h"
+#include "gdbcmd.h"
+#include "gdbcore.h"
+#include "gdbthread.h"
+#include "inf-child.h"
+#include "inf-loop.h"
+#include "inferior.h"
+#include "objfiles.h"
+#include "regcache.h"
+#include "symfile.h"
+#include "symtab.h"
+#include "target.h"
+#include "top.h"
+#include "value.h"
+
 /* Quick overview.
    Darwin kernel is Mach + BSD derived kernel.  Note that they share the
    same memory space and are linked together (ie there is no micro-kernel).