From d8d480851a2e75a289733f63809dd40d4b29022d Mon Sep 17 00:00:00 2001
From: Pedro Gonnet <gonnet@google.com>
Date: Mon, 31 Aug 2015 22:45:46 +0200
Subject: [PATCH] clean up includes, i.e. sort them alphabetically.

Former-commit-id: 19fbc6ca163c7911b2d6c2f30ca2166152e3341c
---
 src/cell.c               | 12 ++++++------
 src/cell.h               |  2 +-
 src/common_io.c          |  6 +++---
 src/debug.h              |  2 +-
 src/engine.c             | 16 ++++++++--------
 src/engine.h             |  6 +++---
 src/kernel.h             |  2 +-
 src/multipole.c          |  6 +++---
 src/multipole.h          |  2 +-
 src/parallel_io.c        | 10 +++++-----
 src/parallel_io.h        |  2 +-
 src/proxy.c              | 12 ++++++------
 src/proxy.h              |  2 +-
 src/runner.c             | 18 +++++++++---------
 src/runner_doiact.h      |  2 +-
 src/runner_iact.h        |  2 +-
 src/runner_iact_legacy.h |  2 +-
 src/scheduler.c          | 14 +++++++-------
 src/scheduler.h          |  4 ++--
 src/serial_io.c          |  8 ++++----
 src/serial_io.h          |  2 +-
 src/single_io.c          |  8 ++++----
 src/single_io.h          |  2 +-
 src/space.c              | 14 +++++++-------
 src/space.h              |  2 +-
 src/swift.h              | 28 ++++++++++++++--------------
 src/task.c               | 12 ++++++------
 src/task.h               |  2 +-
 src/units.c              |  4 ++--
 src/version.c            |  3 +++
 30 files changed, 105 insertions(+), 102 deletions(-)

diff --git a/src/cell.c b/src/cell.c
index 2df3608b03..87b51ac82c 100644
--- a/src/cell.c
+++ b/src/cell.c
@@ -21,13 +21,13 @@
 #include "../config.h"
 
 /* Some standard headers. */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <pthread.h>
 #include <float.h>
 #include <limits.h>
 #include <math.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 /* MPI headers. */
 #ifdef WITH_MPI
@@ -44,9 +44,9 @@
 
 /* Local headers. */
 #include "atomic.h"
-#include "timers.h"
-#include "space.h"
 #include "error.h"
+#include "space.h"
+#include "timers.h"
 
 /* Global variables. */
 int cell_next_tag = 0;
diff --git a/src/cell.h b/src/cell.h
index ee3a1b65b2..7a5353bcae 100644
--- a/src/cell.h
+++ b/src/cell.h
@@ -21,8 +21,8 @@
 
 /* Includes. */
 #include "lock.h"
-#include "part.h"
 #include "multipole.h"
+#include "part.h"
 
 /* Forward declaration of space, needed for cell_unpack. */
 struct space;
diff --git a/src/common_io.c b/src/common_io.c
index c200a2deb1..64194e5829 100644
--- a/src/common_io.c
+++ b/src/common_io.c
@@ -24,12 +24,12 @@
 #if defined(HAVE_HDF5)
 
 /* Some standard headers. */
+#include <hdf5.h>
+#include <math.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stddef.h>
-#include <hdf5.h>
-#include <math.h>
 
 /* MPI headers. */
 #ifdef WITH_MPI
diff --git a/src/debug.h b/src/debug.h
index 36d0967a1c..42269fc267 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -20,8 +20,8 @@
 #define SWIFT_DEBUG_H
 
 /* Includes. */
-#include "part.h"
 #include "cell.h"
+#include "part.h"
 
 void print_cell(struct cell *c);
 void printParticle(struct part *parts, long long int i, int N);
diff --git a/src/engine.c b/src/engine.c
index 542035213f..f730f0fe47 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -21,15 +21,15 @@
 #include "../config.h"
 
 /* Some standard headers. */
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <math.h>
 #include <float.h>
 #include <limits.h>
+#include <math.h>
 #include <omp.h>
 #include <sched.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 /* MPI headers. */
 #ifdef WITH_MPI
@@ -45,12 +45,12 @@
 #include "engine.h"
 
 /* Local headers. */
-#include "cycle.h"
 #include "atomic.h"
-#include "timers.h"
-#include "debug.h"
 #include "cell.h"
+#include "cycle.h"
+#include "debug.h"
 #include "error.h"
+#include "timers.h"
 
 #ifdef LEGACY_GADGET2_SPH
 #include "runner_iact_legacy.h"
diff --git a/src/engine.h b/src/engine.h
index 149bb434d9..caa286e7d3 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -23,12 +23,12 @@
 #include <pthread.h>
 
 /* Includes. */
+#include "lock.h"
 #include "proxy.h"
+#include "runner.h"
+#include "scheduler.h"
 #include "space.h"
 #include "task.h"
-#include "lock.h"
-#include "scheduler.h"
-#include "runner.h"
 
 /* Some constants. */
 #define engine_policy_none 0
diff --git a/src/kernel.h b/src/kernel.h
index da1d006e68..0fc232597e 100644
--- a/src/kernel.h
+++ b/src/kernel.h
@@ -21,9 +21,9 @@
 #define SWIFT_KERNEL_H
 
 /* Includes. */
-#include "vector.h"
 #include "const.h"
 #include "inline.h"
+#include "vector.h"
 
 /**
  * @file kernel.h
diff --git a/src/multipole.c b/src/multipole.c
index d76d7c14e4..439e9cd5f0 100644
--- a/src/multipole.c
+++ b/src/multipole.c
@@ -21,12 +21,12 @@
 #include "../config.h"
 
 /* Some standard headers. */
+#include <float.h>
+#include <limits.h>
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <math.h>
-#include <float.h>
-#include <limits.h>
 
 /* MPI headers. */
 #ifdef WITH_MPI
diff --git a/src/multipole.h b/src/multipole.h
index 690d997a74..ffa5d713f5 100644
--- a/src/multipole.h
+++ b/src/multipole.h
@@ -23,10 +23,10 @@
 #include <math.h>
 
 /* Includes. */
+#include "const.h"
 #include "inline.h"
 #include "kernel.h"
 #include "part.h"
-#include "const.h"
 
 /* Some constants. */
 #define multipole_order 1
diff --git a/src/parallel_io.c b/src/parallel_io.c
index f119fc0ebf..ccd35fe06e 100644
--- a/src/parallel_io.c
+++ b/src/parallel_io.c
@@ -27,20 +27,20 @@
 #define H5_HAVE_PARALLEL
 
 /* Some standard headers. */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stddef.h>
 #include <hdf5.h>
 #include <math.h>
 #include <mpi.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 /* This object's header. */
 #include "parallel_io.h"
 
 /* Local includes. */
-#include "error.h"
 #include "common_io.h"
+#include "error.h"
 
 /**
  * @brief Reads a data array from a given HDF5 group.
diff --git a/src/parallel_io.h b/src/parallel_io.h
index b6f2929e4e..fa46a230ab 100644
--- a/src/parallel_io.h
+++ b/src/parallel_io.h
@@ -25,8 +25,8 @@
 #endif
 
 /* Includes. */
-#include "part.h"
 #include "engine.h"
+#include "part.h"
 #include "units.h"
 
 #if defined(HAVE_HDF5) && defined(WITH_MPI) && defined(HAVE_PARALLEL_HDF5)
diff --git a/src/proxy.c b/src/proxy.c
index f801557512..447a7a90be 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -21,16 +21,16 @@
 #include "../config.h"
 
 /* Some standard headers. */
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <pthread.h>
-#include <math.h>
 #include <float.h>
 #include <limits.h>
+#include <math.h>
 #include <omp.h>
+#include <pthread.h>
 #include <sched.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 /* MPI headers. */
 #ifdef WITH_MPI
diff --git a/src/proxy.h b/src/proxy.h
index 256a402726..8cb08d0a66 100644
--- a/src/proxy.h
+++ b/src/proxy.h
@@ -20,8 +20,8 @@
 #define SWIFT_PROXY_H
 
 /* Includes. */
-#include "part.h"
 #include "cell.h"
+#include "part.h"
 
 /* Some constants. */
 #define proxy_buffgrow 1.5
diff --git a/src/runner.c b/src/runner.c
index a1bfb53c77..173215a6a5 100644
--- a/src/runner.c
+++ b/src/runner.c
@@ -21,14 +21,14 @@
 #include "../config.h"
 
 /* Some standard headers. */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <pthread.h>
-#include <math.h>
 #include <float.h>
 #include <limits.h>
+#include <math.h>
 #include <omp.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 /* MPI headers. */
 #ifdef WITH_MPI
@@ -40,12 +40,12 @@
 
 /* Local headers. */
 #include "const.h"
-#include "timers.h"
-#include "task.h"
-#include "space.h"
-#include "scheduler.h"
 #include "engine.h"
 #include "error.h"
+#include "scheduler.h"
+#include "space.h"
+#include "task.h"
+#include "timers.h"
 
 /* Include the right variant of the SPH interactions */
 #ifdef LEGACY_GADGET2_SPH
diff --git a/src/runner_doiact.h b/src/runner_doiact.h
index 17a02321c3..017529cc94 100644
--- a/src/runner_doiact.h
+++ b/src/runner_doiact.h
@@ -18,8 +18,8 @@
  ******************************************************************************/
 
 /* Includes. */
-#include "part.h"
 #include "cell.h"
+#include "part.h"
 
 /* Before including this file, define FUNCTION, which is the
    name of the interaction function. This creates the interaction functions
diff --git a/src/runner_iact.h b/src/runner_iact.h
index 2ed6ce836a..e1561132af 100644
--- a/src/runner_iact.h
+++ b/src/runner_iact.h
@@ -21,9 +21,9 @@
 #define SWIFT_RUNNER_IACT_H
 
 /* Includes. */
-#include "part.h"
 #include "const.h"
 #include "kernel.h"
+#include "part.h"
 #include "vector.h"
 
 /**
diff --git a/src/runner_iact_legacy.h b/src/runner_iact_legacy.h
index 8678093483..3f5df4cd40 100644
--- a/src/runner_iact_legacy.h
+++ b/src/runner_iact_legacy.h
@@ -21,9 +21,9 @@
 #define SWIFT_RUNNER_IACT_LECAGY_H
 
 /* Includes. */
-#include "part.h"
 #include "const.h"
 #include "kernel.h"
+#include "part.h"
 #include "vector.h"
 
 /**
diff --git a/src/scheduler.c b/src/scheduler.c
index 87c5414a3a..bbcac93be2 100644
--- a/src/scheduler.c
+++ b/src/scheduler.c
@@ -21,13 +21,13 @@
 #include "../config.h"
 
 /* Some standard headers. */
+#include <limits.h>
+#include <math.h>
+#include <omp.h>
+#include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <math.h>
-#include <pthread.h>
-#include <limits.h>
-#include <omp.h>
 
 /* MPI headers. */
 #ifdef WITH_MPI
@@ -38,12 +38,12 @@
 #include "scheduler.h"
 
 /* Local headers. */
-#include "error.h"
-#include "cycle.h"
 #include "atomic.h"
-#include "timers.h"
 #include "const.h"
+#include "cycle.h"
+#include "error.h"
 #include "kernel.h"
+#include "timers.h"
 
 /**
  * @brief Add an unlock_task to the given task.
diff --git a/src/scheduler.h b/src/scheduler.h
index b693c6f1ba..620b712885 100644
--- a/src/scheduler.h
+++ b/src/scheduler.h
@@ -24,10 +24,10 @@
 
 /* Includes. */
 #include "cell.h"
-#include "queue.h"
-#include "task.h"
 #include "lock.h"
+#include "queue.h"
 #include "space.h"
+#include "task.h"
 
 /* Some constants. */
 #define scheduler_maxwait 3
diff --git a/src/serial_io.c b/src/serial_io.c
index 9d39695b19..f771f3d4f1 100644
--- a/src/serial_io.c
+++ b/src/serial_io.c
@@ -24,12 +24,12 @@
 #if defined(HAVE_HDF5) && defined(WITH_MPI) && !defined(HAVE_PARALLEL_HDF5)
 
 /* Some standard headers. */
+#include <hdf5.h>
+#include <math.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stddef.h>
-#include <hdf5.h>
-#include <math.h>
 
 /* MPI headers. */
 #ifdef WITH_MPI
@@ -40,8 +40,8 @@
 #include "serial_io.h"
 
 /* Local includes. */
-#include "error.h"
 #include "common_io.h"
+#include "error.h"
 
 /*-----------------------------------------------------------------------------
  * Routines reading an IC file
diff --git a/src/serial_io.h b/src/serial_io.h
index e963184d42..bb05fc61bd 100644
--- a/src/serial_io.h
+++ b/src/serial_io.h
@@ -25,8 +25,8 @@
 #endif
 
 /* Includes. */
-#include "part.h"
 #include "engine.h"
+#include "part.h"
 #include "units.h"
 
 #if defined(HAVE_HDF5) && defined(WITH_MPI) && !defined(HAVE_PARALLEL_HDF5)
diff --git a/src/single_io.c b/src/single_io.c
index 0edab319e1..0874442982 100644
--- a/src/single_io.c
+++ b/src/single_io.c
@@ -24,19 +24,19 @@
 #if defined(HAVE_HDF5) && !defined(WITH_MPI)
 
 /* Some standard headers. */
+#include <hdf5.h>
+#include <math.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stddef.h>
-#include <hdf5.h>
-#include <math.h>
 
 /* This object's header. */
 #include "single_io.h"
 
 /* Local includes. */
-#include "error.h"
 #include "common_io.h"
+#include "error.h"
 
 /*-----------------------------------------------------------------------------
  * Routines reading an IC file
diff --git a/src/single_io.h b/src/single_io.h
index 61e9a7e6aa..91d229178b 100644
--- a/src/single_io.h
+++ b/src/single_io.h
@@ -20,8 +20,8 @@
 #define SWIFT_SINGLE_IO_H
 
 /* Includes. */
-#include "part.h"
 #include "engine.h"
+#include "part.h"
 #include "units.h"
 
 #if defined(HAVE_HDF5) && !defined(WITH_MPI)
diff --git a/src/space.c b/src/space.c
index e36e9547e5..f99f593292 100644
--- a/src/space.c
+++ b/src/space.c
@@ -21,14 +21,14 @@
 #include "../config.h"
 
 /* Some standard headers. */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <pthread.h>
 #include <float.h>
 #include <limits.h>
 #include <math.h>
 #include <omp.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 /* MPI headers. */
 #ifdef WITH_MPI
@@ -40,11 +40,11 @@
 
 /* Local headers. */
 #include "atomic.h"
-#include "lock.h"
-#include "kernel.h"
 #include "engine.h"
-#include "runner.h"
 #include "error.h"
+#include "kernel.h"
+#include "lock.h"
+#include "runner.h"
 
 /* Split size. */
 int space_splitsize = space_splitsize_default;
diff --git a/src/space.h b/src/space.h
index 32c991637a..e0bad67735 100644
--- a/src/space.h
+++ b/src/space.h
@@ -20,8 +20,8 @@
 #define SWIFT_SPACE_H
 
 /* Includes. */
-#include "part.h"
 #include "cell.h"
+#include "part.h"
 
 /* Forward-declare the engine to avoid cyclic includes. */
 struct engine;
diff --git a/src/swift.h b/src/swift.h
index edb87b16a8..b302bca9b0 100644
--- a/src/swift.h
+++ b/src/swift.h
@@ -23,27 +23,27 @@
 #include "../config.h"
 
 /* Local headers. */
+#include "atomic.h"
+#include "cell.h"
 #include "const.h"
-#include "error.h"
-#include "cycle.h"
-#include "timers.h"
 #include "const.h"
-#include "atomic.h"
+#include "cycle.h"
+#include "debug.h"
+#include "engine.h"
+#include "error.h"
 #include "lock.h"
-#include "task.h"
-#include "scheduler.h"
-#include "part.h"
 #include "multipole.h"
-#include "cell.h"
-#include "space.h"
+#include "parallel_io.h"
+#include "part.h"
 #include "queue.h"
 #include "runner.h"
-#include "engine.h"
-#include "units.h"
-#include "single_io.h"
+#include "scheduler.h"
 #include "serial_io.h"
-#include "parallel_io.h"
-#include "debug.h"
+#include "single_io.h"
+#include "space.h"
+#include "task.h"
+#include "timers.h"
+#include "units.h"
 #include "version.h"
 
 #ifdef LEGACY_GADGET2_SPH
diff --git a/src/task.c b/src/task.c
index 4a068d5a79..19b96799c7 100644
--- a/src/task.c
+++ b/src/task.c
@@ -21,15 +21,15 @@
 #include "../config.h"
 
 /* Some standard headers. */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <pthread.h>
-#include <math.h>
 #include <float.h>
 #include <limits.h>
+#include <math.h>
 #include <omp.h>
+#include <pthread.h>
 #include <sched.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 /* MPI headers. */
 #ifdef WITH_MPI
@@ -41,8 +41,8 @@
 
 /* Local headers. */
 #include "atomic.h"
-#include "lock.h"
 #include "error.h"
+#include "lock.h"
 
 /* Task type names. */
 const char *taskID_names[task_type_count] = {
diff --git a/src/task.h b/src/task.h
index 27193f6ec9..0d3a68e1e8 100644
--- a/src/task.h
+++ b/src/task.h
@@ -20,8 +20,8 @@
 #define SWIFT_TASK_H
 
 /* Includes. */
-#include "cycle.h"
 #include "cell.h"
+#include "cycle.h"
 
 /* Some constants. */
 #define task_maxwait 3
diff --git a/src/units.c b/src/units.c
index 60cdbe6cae..af705323bd 100644
--- a/src/units.c
+++ b/src/units.c
@@ -22,11 +22,11 @@
 #include "../config.h"
 
 /* Some standard headers. */
+#include <math.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stddef.h>
-#include <math.h>
 
 /* MPI headers. */
 #ifdef WITH_MPI
diff --git a/src/version.c b/src/version.c
index 940444f76f..eb622b8557 100644
--- a/src/version.c
+++ b/src/version.c
@@ -18,7 +18,10 @@
  *
  ******************************************************************************/
 
+/* Some standard headers. */
 #include <stdio.h>
+
+/* This object's header. */
 #include "version.h"
 
 /**
-- 
GitLab