Fix include order

cli.h

@@ -23,6 +23,12 @@
 #include <stdint.h>
 #ifdef HAVE_JNI_H
 #include <jni.h>
+
+// Stop OpenJDK 7 from foisting their UNUSED() macro on us in <jni_md.h>
+#ifdef UNUSED
+# undef UNUSED
+#endif
+
 #endif
 #include "xprintf.h"
 #include "log.h"

conf_cli.c

@@ -17,8 +17,8 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-#include "conf.h"
 #include "cli.h"
+#include "conf.h"
 #include "commandline.h"
 #include "strbuf.h"
 #include "strbuf_helpers.h"

constants.h

@@ -25,11 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // Number of elements in an array (Warning: does not work if A is a pointer!).
 #define NELS(A) (sizeof (A) / sizeof *(A))
 
-// Stop OpenJDK 7 from foisting their UNUSED() macro on us in <jni_md.h>
-#ifdef UNUSED
-# undef UNUSED
-#endif
-
 // To suppress the "unused parameter" warning from -Wunused-parameter.
 #ifndef __has_attribute
   #define __has_attribute(x) 0

keyring_cli.c

@@ -18,12 +18,12 @@
  */
 
 #include <stdio.h>
+#include "cli.h"
 #include "serval_types.h"
 #include "dataformats.h"
 #include "os.h"
 #include "conf.h"
 #include "mdp_client.h"
-#include "cli.h"
 #include "commandline.h"
 #include "keyring.h"
 

network_cli.c

@@ -21,10 +21,10 @@
 #include <stdint.h>
 #include <signal.h>
 #include <math.h>
+#include "cli.h"
 #include "dataformats.h"
 #include "mdp_client.h"
 #include "conf.h"
-#include "cli.h"
 #include "commandline.h"
 #include "sighandlers.h"