Reorder includes

This restores compatibility with CompCert

src/libsodium/crypto_hash/sha256/cp/hash_sha256_cp.c

@@ -26,17 +26,17 @@
  *
  */
 
-#include "crypto_hash_sha256.h"
-#include "private/common.h"
-#include "utils.h"
-
-#include <sys/types.h>
-
 #include <limits.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include <sys/types.h>
+
+#include "crypto_hash_sha256.h"
+#include "private/common.h"
+#include "utils.h"
+
 static void
 be32enc_vect(unsigned char *dst, const uint32_t *src, size_t len)
 {

src/libsodium/crypto_hash/sha512/cp/hash_sha512_cp.c

@@ -26,17 +26,17 @@
  *
  */
 
-#include "crypto_hash_sha512.h"
-#include "private/common.h"
-#include "utils.h"
-
-#include <sys/types.h>
-
 #include <limits.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include <sys/types.h>
+
+#include "crypto_hash_sha512.h"
+#include "private/common.h"
+#include "utils.h"
+
 static void
 be64enc_vect(unsigned char *dst, const uint64_t *src, size_t len)
 {

src/libsodium/crypto_pwhash/argon2/argon2-core.c

@@ -11,16 +11,17 @@
  * <http://creativecommons.org/publicdomain/zero/1.0/>.
  */
 
-#include <sys/types.h>
-#ifdef HAVE_SYS_MMAN_H
-# include <sys/mman.h>
-#endif
 #include <errno.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include <sys/types.h>
+#ifdef HAVE_SYS_MMAN_H
+# include <sys/mman.h>
+#endif
+
 #include "crypto_generichash_blake2b.h"
 #include "private/common.h"
 #include "runtime.h"

src/libsodium/crypto_pwhash/scryptsalsa208sha256/pbkdf2-sha256.c

@@ -25,12 +25,12 @@
  */
 
 #include <limits.h>
-#include <stdlib.h>
-#include <sys/types.h>
-
 #include <stdint.h>
+#include <stdlib.h>
 #include <string.h>
 
+#include <sys/types.h>
+
 #include "crypto_auth_hmacsha256.h"
 #include "pbkdf2-sha256.h"
 #include "private/common.h"

src/libsodium/crypto_pwhash/scryptsalsa208sha256/pbkdf2-sha256.h

@@ -28,10 +28,10 @@
 #ifndef pbkdf2_sha256_H
 #define pbkdf2_sha256_H
 
-#include <sys/types.h>
-
 #include <stdint.h>
 
+#include <sys/types.h>
+
 #include "crypto_auth_hmacsha256.h"
 
 /**

src/libsodium/include/sodium/crypto_onetimeauth_poly1305.h

@@ -1,9 +1,6 @@
 #ifndef crypto_onetimeauth_poly1305_H
 #define crypto_onetimeauth_poly1305_H
 
-#include <stdlib.h>
-#include "export.h"
-
 #ifdef __cplusplus
 # ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wlong-long"
@@ -11,10 +8,13 @@
 extern "C" {
 #endif
 
-#include <sys/types.h>
-
 #include <stdint.h>
 #include <stdio.h>
+#include <stdlib.h>
+
+#include <sys/types.h>
+
+#include "export.h"
 
 typedef CRYPTO_ALIGN(16) struct crypto_onetimeauth_poly1305_state {
     unsigned char opaque[256];

src/libsodium/include/sodium/randombytes.h

@@ -2,11 +2,11 @@
 #ifndef randombytes_H
 #define randombytes_H
 
-#include <sys/types.h>
-
 #include <stddef.h>
 #include <stdint.h>
 
+#include <sys/types.h>
+
 #include "export.h"
 
 #ifdef __cplusplus

src/libsodium/randombytes/randombytes.c

@@ -1,12 +1,11 @@
 
-#include <stdlib.h>
-#include <sys/types.h>
-
 #include <assert.h>
 #include <limits.h>
 #include <stdint.h>
 #include <stdlib.h>
 
+#include <sys/types.h>
+
 #ifdef __EMSCRIPTEN__
 # include <emscripten.h>
 #endif

src/libsodium/randombytes/salsa20/randombytes_salsa20_random.c

@@ -1,5 +1,16 @@
 
+#include <assert.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <stdint.h>
 #include <stdlib.h>
+#include <stdlib.h>
+#include <string.h>
+#if !defined(_MSC_VER) && !defined(__BORLANDC__)
+# include <unistd.h>
+#endif
+
 #include <sys/types.h>
 #ifndef _WIN32
 # include <sys/stat.h>
@@ -14,17 +25,6 @@
 # include <poll.h>
 #endif
 
-#include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#if !defined(_MSC_VER) && !defined(__BORLANDC__)
-# include <unistd.h>
-#endif
-
 #include "crypto_core_salsa20.h"
 #include "crypto_generichash.h"
 #include "crypto_stream_salsa20.h"

src/libsodium/randombytes/sysrandom/randombytes_sysrandom.c

@@ -1,4 +1,14 @@
 
+#include <assert.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <stdint.h>
+#include <string.h>
+#ifndef _WIN32
+# include <unistd.h>
+#endif
+
 #include <stdlib.h>
 #include <sys/types.h>
 #ifndef _WIN32
@@ -14,16 +24,6 @@
 # include <poll.h>
 #endif
 
-#include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stdint.h>
-#include <string.h>
-#ifndef _WIN32
-# include <unistd.h>
-#endif
-
 #include "randombytes.h"
 #include "randombytes_sysrandom.h"
 #include "utils.h"