diff --git a/auto_tests/TCP_test.c b/auto_tests/TCP_test.c
index 2721fbd2..4c26926f 100644
--- a/auto_tests/TCP_test.c
+++ b/auto_tests/TCP_test.c
@@ -2,15 +2,15 @@
 #include "config.h"
 #endif
 
-#include <sys/types.h>
-#include <stdint.h>
-#include <string.h>
 #include <check.h>
+#include <stdint.h>
 #include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
 #include <time.h>
 
-#include "../toxcore/TCP_server.h"
 #include "../toxcore/TCP_client.h"
+#include "../toxcore/TCP_server.h"
 
 #include "../toxcore/util.h"
 
diff --git a/auto_tests/assoc_test.c b/auto_tests/assoc_test.c
index 05c8d2f3..e9f5207f 100644
--- a/auto_tests/assoc_test.c
+++ b/auto_tests/assoc_test.c
@@ -7,9 +7,9 @@
 #include "../toxcore/assoc.h"
 #include "../toxcore/util.h"
 
-#include <sys/types.h>
 #include <stdint.h>
 #include <string.h>
+#include <sys/types.h>
 
 #include <check.h>
 
diff --git a/auto_tests/crypto_test.c b/auto_tests/crypto_test.c
index e7201a34..eeb99567 100644
--- a/auto_tests/crypto_test.c
+++ b/auto_tests/crypto_test.c
@@ -2,13 +2,13 @@
 #include "config.h"
 #endif
 
-#include "../toxcore/net_crypto.h"
-#include <sys/types.h>
-#include <stdint.h>
-#include <string.h>
 #include <check.h>
+#include <stdint.h>
 #include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
 #include <time.h>
+#include "../toxcore/net_crypto.h"
 
 #include "helpers.h"
 
diff --git a/auto_tests/dht_test.c b/auto_tests/dht_test.c
index b5d979f4..92209e7a 100644
--- a/auto_tests/dht_test.c
+++ b/auto_tests/dht_test.c
@@ -5,8 +5,8 @@
 #include <sys/param.h>
 #include <time.h>
 
-#include "../toxcore/tox.h"
 #include "../toxcore/DHT.c"
+#include "../toxcore/tox.h"
 
 #include "helpers.h"
 
diff --git a/auto_tests/encryptsave_test.c b/auto_tests/encryptsave_test.c
index d27f7d6b..99a5792e 100644
--- a/auto_tests/encryptsave_test.c
+++ b/auto_tests/encryptsave_test.c
@@ -2,19 +2,19 @@
 #include "config.h"
 #endif
 
-#include <sys/types.h>
-#include <stdint.h>
-#include <string.h>
 #include <check.h>
+#include <stdint.h>
 #include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
 #include <time.h>
 
 #include "helpers.h"
 
 #include "../toxcore/tox.h"
 
-#include "../toxencryptsave/toxencryptsave.h"
 #include "../toxcore/crypto_core.h"
+#include "../toxencryptsave/toxencryptsave.h"
 #ifdef VANILLA_NACL
 #include "../toxencryptsave/crypto_pwhash_scryptsalsa208sha256/crypto_pwhash_scryptsalsa208sha256.h"
 #endif
diff --git a/auto_tests/messenger_test.c b/auto_tests/messenger_test.c
index b8559b17..2407574e 100644
--- a/auto_tests/messenger_test.c
+++ b/auto_tests/messenger_test.c
@@ -14,12 +14,12 @@
 #include "config.h"
 #endif
 
-#include "../testing/misc_tools.c" // hex_string_to_bin
-#include "../toxcore/Messenger.h"
-#include <sys/types.h>
+#include <check.h>
 #include <stdint.h>
 #include <string.h>
-#include <check.h>
+#include <sys/types.h>
+#include "../testing/misc_tools.c" // hex_string_to_bin
+#include "../toxcore/Messenger.h"
 
 #include "helpers.h"
 
diff --git a/auto_tests/network_test.c b/auto_tests/network_test.c
index b88b0e8c..b5d8b33e 100644
--- a/auto_tests/network_test.c
+++ b/auto_tests/network_test.c
@@ -2,11 +2,11 @@
 #include "config.h"
 #endif
 
-#include <sys/types.h>
-#include <stdint.h>
-#include <string.h>
 #include <check.h>
+#include <stdint.h>
 #include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
 #include <time.h>
 
 #include "../toxcore/network.h"
diff --git a/auto_tests/onion_test.c b/auto_tests/onion_test.c
index fe764517..b12c6a3f 100644
--- a/auto_tests/onion_test.c
+++ b/auto_tests/onion_test.c
@@ -2,11 +2,11 @@
 #include "config.h"
 #endif
 
-#include <sys/types.h>
-#include <stdint.h>
-#include <string.h>
 #include <check.h>
+#include <stdint.h>
 #include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
 #include <time.h>
 
 #include "../toxcore/onion.h"
diff --git a/auto_tests/skeleton_test.c b/auto_tests/skeleton_test.c
index 27c9123a..8d3ec3bb 100644
--- a/auto_tests/skeleton_test.c
+++ b/auto_tests/skeleton_test.c
@@ -2,11 +2,11 @@
 #include "config.h"
 #endif
 
-#include <sys/types.h>
-#include <stdint.h>
-#include <string.h>
 #include <check.h>
+#include <stdint.h>
 #include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
 #include <time.h>
 
 #include "helpers.h"
diff --git a/auto_tests/tox_test.c b/auto_tests/tox_test.c
index a8fba35d..b2dc0c17 100644
--- a/auto_tests/tox_test.c
+++ b/auto_tests/tox_test.c
@@ -14,13 +14,13 @@
 #include "config.h"
 #endif
 
+#include <check.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/param.h>
 #include <sys/types.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdio.h>
-#include <check.h>
-#include <stdlib.h>
 #include <time.h>
 
 #include "../toxcore/tox.h"
diff --git a/auto_tests/toxav_basic_test.c b/auto_tests/toxav_basic_test.c
index 701cf841..971c1d83 100644
--- a/auto_tests/toxav_basic_test.c
+++ b/auto_tests/toxav_basic_test.c
@@ -12,20 +12,20 @@
 #   include "helpers.h"
 #endif
 
-#include <sys/types.h>
 #include <stdint.h>
-#include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
 #include <time.h>
 
 #include <vpx/vpx_image.h>
 
+#include "../toxav/toxav.h"
+#include "../toxcore/crypto_core.h"
+#include "../toxcore/logger.h"
 #include "../toxcore/tox.h"
 #include "../toxcore/util.h"
-#include "../toxcore/logger.h"
-#include "../toxcore/crypto_core.h"
-#include "../toxav/toxav.h"
 
 
 #if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
diff --git a/auto_tests/toxav_many_test.c b/auto_tests/toxav_many_test.c
index 24d2ae6e..e3476512 100644
--- a/auto_tests/toxav_many_test.c
+++ b/auto_tests/toxav_many_test.c
@@ -12,26 +12,26 @@
 #   include "helpers.h"
 #endif
 
-#include <sys/types.h>
 #include <stdint.h>
-#include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
 #include <time.h>
 
 #include <vpx/vpx_image.h>
 
+#include "../toxav/toxav.h"
+#include "../toxcore/crypto_core.h"
+#include "../toxcore/logger.h"
 #include "../toxcore/tox.h"
 #include "../toxcore/util.h"
-#include "../toxcore/logger.h"
-#include "../toxcore/crypto_core.h"
-#include "../toxav/toxav.h"
 
 #if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
 #define c_sleep(x) Sleep(1*x)
 #else
-#include <unistd.h>
 #include <pthread.h>
+#include <unistd.h>
 #define c_sleep(x) usleep(1000*x)
 #endif
 
diff --git a/other/DHT_bootstrap.c b/other/DHT_bootstrap.c
index 5ce8e40d..b67dd100 100644
--- a/other/DHT_bootstrap.c
+++ b/other/DHT_bootstrap.c
@@ -50,8 +50,8 @@
 #if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
 #define c_sleep(x) Sleep(1*x)
 #else
-#include <unistd.h>
 #include <arpa/inet.h>
+#include <unistd.h>
 #define c_sleep(x) usleep(1000*x)
 #endif
 
diff --git a/other/bootstrap_daemon/src/config.c b/other/bootstrap_daemon/src/config.c
index 29924ae4..dc0a251c 100644
--- a/other/bootstrap_daemon/src/config.c
+++ b/other/bootstrap_daemon/src/config.c
@@ -29,7 +29,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <string.h>
 
 #include <libconfig.h>
 
diff --git a/other/bootstrap_daemon/src/tox-bootstrapd.c b/other/bootstrap_daemon/src/tox-bootstrapd.c
index 72d4572c..2ae60f76 100644
--- a/other/bootstrap_daemon/src/tox-bootstrapd.c
+++ b/other/bootstrap_daemon/src/tox-bootstrapd.c
@@ -33,8 +33,8 @@
 
 // toxcore
 #include "../../../toxcore/LAN_discovery.h"
-#include "../../../toxcore/onion_announce.h"
 #include "../../../toxcore/TCP_server.h"
+#include "../../../toxcore/onion_announce.h"
 #include "../../../toxcore/util.h"
 
 // misc
diff --git a/testing/DHT_test.c b/testing/DHT_test.c
index cd3ff5f7..e782d765 100644
--- a/testing/DHT_test.c
+++ b/testing/DHT_test.c
@@ -44,8 +44,8 @@
 #define c_sleep(x) Sleep(1*x)
 
 #else
-#include <unistd.h>
 #include <arpa/inet.h>
+#include <unistd.h>
 #define c_sleep(x) usleep(1000*x)
 
 #endif
diff --git a/testing/Messenger_test.c b/testing/Messenger_test.c
index f31052e3..790439e7 100644
--- a/testing/Messenger_test.c
+++ b/testing/Messenger_test.c
@@ -49,8 +49,8 @@
 #define c_sleep(x) Sleep(1*x)
 
 #else
-#include <unistd.h>
 #include <arpa/inet.h>
+#include <unistd.h>
 #define c_sleep(x) usleep(1000*x)
 #define PORT 33445
 
diff --git a/testing/av_test.c b/testing/av_test.c
index c370a66f..2870e587 100644
--- a/testing/av_test.c
+++ b/testing/av_test.c
@@ -24,9 +24,9 @@
 
 
 #include "../toxav/toxav.h"
+#include "../toxcore/network.h" /* current_time_monotonic() */
 #include "../toxcore/tox.h"
 #include "../toxcore/util.h"
-#include "../toxcore/network.h" /* current_time_monotonic() */
 
 /* Playing audio data */
 #include <portaudio.h>
@@ -35,16 +35,16 @@
 
 /* Reading and Displaying video data */
 #include <opencv/cv.h>
-#include <opencv/highgui.h>
 #include <opencv/cvwimage.h>
+#include <opencv/highgui.h>
 
-#include <sys/stat.h>
 #include <assert.h>
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <time.h>
 #include <string.h>
-#include <errno.h>
+#include <sys/stat.h>
+#include <time.h>
 #include <unistd.h>
 
 #ifdef __APPLE__
diff --git a/testing/dns3_test.c b/testing/dns3_test.c
index ee719b8e..063ea8c7 100644
--- a/testing/dns3_test.c
+++ b/testing/dns3_test.c
@@ -1,8 +1,8 @@
 
 
-#include "../toxdns/toxdns.h"
-#include "../toxcore/tox.h"
 #include "../toxcore/network.h"
+#include "../toxcore/tox.h"
+#include "../toxdns/toxdns.h"
 #include "misc_tools.c"
 
 #if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
diff --git a/testing/irc_syncbot.c b/testing/irc_syncbot.c
index 01e557d5..558b3631 100644
--- a/testing/irc_syncbot.c
+++ b/testing/irc_syncbot.c
@@ -1,19 +1,19 @@
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
 
-#include <fcntl.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <errno.h>
+#include <fcntl.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#include <netdb.h>
 #include <unistd.h>
 
 #include <sys/ioctl.h>
diff --git a/testing/misc_tools.c b/testing/misc_tools.c
index ba49ebc8..de246d82 100644
--- a/testing/misc_tools.c
+++ b/testing/misc_tools.c
@@ -25,10 +25,10 @@
 #include "config.h"
 #endif
 
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
 #include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #ifdef TOX_DEBUG
 #include <assert.h>
diff --git a/testing/nTox.c b/testing/nTox.c
index 3494015c..d55d7653 100644
--- a/testing/nTox.c
+++ b/testing/nTox.c
@@ -29,21 +29,21 @@
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #else
-#include <sys/socket.h>
-#include <netinet/in.h>
 #include <arpa/inet.h>
-#include <sys/types.h>
 #include <netdb.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include <sys/types.h>
 #endif
 
 #include <sys/select.h>
 
-#include "nTox.h"
 #include "misc_tools.c"
+#include "nTox.h"
 
+#include <locale.h>
 #include <stdio.h>
 #include <time.h>
-#include <locale.h>
 
 #if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
 #define c_sleep(x) Sleep(1*x)
diff --git a/testing/tox_shell.c b/testing/tox_shell.c
index f6dae7b9..77047a44 100644
--- a/testing/tox_shell.c
+++ b/testing/tox_shell.c
@@ -40,8 +40,8 @@
 #else
 #include <pty.h>
 #endif
-#include <unistd.h>
 #include <fcntl.h>
+#include <unistd.h>
 
 #define c_sleep(x) usleep(1000*x)
 
diff --git a/testing/tox_sync.c b/testing/tox_sync.c
index c80db339..8fa11625 100644
--- a/testing/tox_sync.c
+++ b/testing/tox_sync.c
@@ -38,10 +38,10 @@
 #include <unistd.h>
 #define c_sleep(x) usleep(1000*x)
 
-#include <dirent.h>
-#include <stdio.h>
-#include <netinet/in.h>
 #include <arpa/inet.h>
+#include <dirent.h>
+#include <netinet/in.h>
+#include <stdio.h>
 
 #define NUM_FILE_SENDERS 256
 typedef struct {
diff --git a/toxav/bwcontroller.c b/toxav/bwcontroller.c
index 4d3b7f7d..a38d71c0 100644
--- a/toxav/bwcontroller.c
+++ b/toxav/bwcontroller.c
@@ -24,9 +24,9 @@
 #endif /* HAVE_CONFIG_H */
 
 #include <assert.h>
-#include "bwcontroller.h"
 #include "../toxcore/logger.h"
 #include "../toxcore/util.h"
+#include "bwcontroller.h"
 
 #define BWC_PACKET_ID 196
 #define BWC_SEND_INTERVAL_MS 1000
diff --git a/toxav/group.c b/toxav/group.c
index 88d9bd5a..dea10af7 100644
--- a/toxav/group.c
+++ b/toxav/group.c
@@ -22,9 +22,9 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#include "group.h"
-#include "../toxcore/util.h"
 #include "../toxcore/logger.h"
+#include "../toxcore/util.h"
+#include "group.h"
 
 #define GROUP_JBUF_SIZE 6
 #define GROUP_JBUF_DEAD_SECONDS 4
diff --git a/toxav/msi.c b/toxav/msi.c
index cdc3c879..3becac7e 100644
--- a/toxav/msi.c
+++ b/toxav/msi.c
@@ -24,15 +24,15 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#include "msi.h"
 #include "../toxcore/logger.h"
 #include "../toxcore/util.h"
+#include "msi.h"
 
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdbool.h>
 #include <assert.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #define MSI_MAXMSG_SIZE 256
 
diff --git a/toxav/msi.h b/toxav/msi.h
index e69581d1..8cb47384 100644
--- a/toxav/msi.h
+++ b/toxav/msi.h
@@ -25,9 +25,9 @@
 #include <inttypes.h>
 #include <pthread.h>
 
+#include "../toxcore/Messenger.h"
 #include "audio.h"
 #include "video.h"
-#include "../toxcore/Messenger.h"
 
 /**
  * Error codes.
diff --git a/toxav/rtp.c b/toxav/rtp.c
index a226f3ff..1556d23d 100644
--- a/toxav/rtp.c
+++ b/toxav/rtp.c
@@ -23,14 +23,14 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#include "rtp.h"
-#include "bwcontroller.h"
+#include "../toxcore/Messenger.h"
 #include "../toxcore/logger.h"
 #include "../toxcore/util.h"
-#include "../toxcore/Messenger.h"
+#include "bwcontroller.h"
+#include "rtp.h"
 
-#include <stdlib.h>
 #include <assert.h>
+#include <stdlib.h>
 
 
 int handle_rtp_packet (Messenger *m, uint32_t friendnumber, const uint8_t *data, uint16_t length, void *object);
diff --git a/toxav/rtp.h b/toxav/rtp.h
index 9a5db78a..18929e12 100644
--- a/toxav/rtp.h
+++ b/toxav/rtp.h
@@ -22,8 +22,8 @@
 #ifndef RTP_H
 #define RTP_H
 
-#include "bwcontroller.h"
 #include "../toxcore/Messenger.h"
+#include "bwcontroller.h"
 #include "stdbool.h"
 
 /**
diff --git a/toxav/toxav_old.c b/toxav/toxav_old.c
index 2945909b..b132080b 100644
--- a/toxav/toxav_old.c
+++ b/toxav/toxav_old.c
@@ -22,8 +22,8 @@
  * This file contains the group chats code for the backwards compatibility.
  */
 
-#include "toxav.h"
 #include "group.h"
+#include "toxav.h"
 
 /* Create a new toxav group.
  *
diff --git a/toxav/video.c b/toxav/video.c
index 251a2cb5..7eba21cf 100644
--- a/toxav/video.c
+++ b/toxav/video.c
@@ -23,12 +23,12 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#include <stdlib.h>
 #include <assert.h>
+#include <stdlib.h>
 
-#include "video.h"
 #include "msi.h"
 #include "rtp.h"
+#include "video.h"
 
 #include "../toxcore/logger.h"
 #include "../toxcore/network.h"
diff --git a/toxav/video.h b/toxav/video.h
index c6a473c2..6aeeaef6 100644
--- a/toxav/video.h
+++ b/toxav/video.h
@@ -24,9 +24,10 @@
 
 #include <vpx/vpx_decoder.h>
 #include <vpx/vpx_encoder.h>
-#include <vpx/vp8dx.h>
-#include <vpx/vp8cx.h>
 #include <vpx/vpx_image.h>
+
+#include <vpx/vp8cx.h>
+#include <vpx/vp8dx.h>
 #define VIDEO_CODEC_DECODER_INTERFACE (vpx_codec_vp8_dx())
 #define VIDEO_CODEC_ENCODER_INTERFACE (vpx_codec_vp8_cx())
 
diff --git a/toxcore/DHT.c b/toxcore/DHT.c
index 538cd220..c9fa9939 100644
--- a/toxcore/DHT.c
+++ b/toxcore/DHT.c
@@ -41,9 +41,9 @@
 
 #include "ping.h"
 
-#include "network.h"
 #include "LAN_discovery.h"
 #include "misc_tools.h"
+#include "network.h"
 #include "util.h"
 
 /* The timeout after which a node is discarded completely. */
diff --git a/toxcore/LAN_discovery.c b/toxcore/LAN_discovery.c
index d430c3fe..ab28f612 100644
--- a/toxcore/LAN_discovery.c
+++ b/toxcore/LAN_discovery.c
@@ -30,9 +30,9 @@
 
 /* Used for get_broadcast(). */
 #ifdef __linux
-#include <sys/ioctl.h>
 #include <arpa/inet.h>
 #include <linux/netdevice.h>
+#include <sys/ioctl.h>
 #endif
 
 #define MAX_INTERFACES 16
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 0d3f10b5..81e17b7b 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -29,9 +29,9 @@
 #include <assert.h>
 #endif
 
-#include "logger.h"
 #include "Messenger.h"
 #include "assoc.h"
+#include "logger.h"
 #include "network.h"
 #include "util.h"
 
diff --git a/toxcore/Messenger.h b/toxcore/Messenger.h
index 75427965..a59f8c4e 100644
--- a/toxcore/Messenger.h
+++ b/toxcore/Messenger.h
@@ -26,8 +26,8 @@
 #ifndef MESSENGER_H
 #define MESSENGER_H
 
-#include "friend_requests.h"
 #include "friend_connection.h"
+#include "friend_requests.h"
 #include "logger.h"
 
 #define MAX_NAME_LENGTH 128
diff --git a/toxcore/TCP_client.h b/toxcore/TCP_client.h
index 37ab30a7..44049698 100644
--- a/toxcore/TCP_client.h
+++ b/toxcore/TCP_client.h
@@ -24,8 +24,8 @@
 #ifndef TCP_CLIENT_H
 #define TCP_CLIENT_H
 
-#include "crypto_core.h"
 #include "TCP_server.h"
+#include "crypto_core.h"
 
 #define TCP_CONNECTION_TIMEOUT 10
 
diff --git a/toxcore/TCP_server.h b/toxcore/TCP_server.h
index 3f6b18ae..908916ef 100644
--- a/toxcore/TCP_server.h
+++ b/toxcore/TCP_server.h
@@ -24,8 +24,8 @@
 #define TCP_SERVER_H
 
 #include "crypto_core.h"
-#include "onion.h"
 #include "list.h"
+#include "onion.h"
 
 #ifdef TCP_SERVER_USE_EPOLL
 #include "sys/epoll.h"
diff --git a/toxcore/assoc.c b/toxcore/assoc.c
index 14f56fb3..3a033851 100644
--- a/toxcore/assoc.c
+++ b/toxcore/assoc.c
@@ -3,9 +3,9 @@
 #include "config.h"
 #endif
 
-#include "logger.h"
 #include "DHT.h"
 #include "assoc.h"
+#include "logger.h"
 #include "ping.h"
 
 #include "LAN_discovery.h"
diff --git a/toxcore/crypto_core.h b/toxcore/crypto_core.h
index 1c9d7f94..2e89896b 100644
--- a/toxcore/crypto_core.h
+++ b/toxcore/crypto_core.h
@@ -30,12 +30,12 @@
 #include <sodium.h>
 #else
 #include <crypto_box.h>
-#include <randombytes.h>
 #include <crypto_hash_sha256.h>
 #include <crypto_hash_sha512.h>
+#include <crypto_scalarmult_curve25519.h>
 #include <crypto_verify_16.h>
 #include <crypto_verify_32.h>
-#include <crypto_scalarmult_curve25519.h>
+#include <randombytes.h>
 #define crypto_box_MACBYTES (crypto_box_ZEROBYTES - crypto_box_BOXZEROBYTES)
 /* I know */
 #define sodium_memcmp(a, b, c) memcmp(a, b, c)
diff --git a/toxcore/friend_connection.h b/toxcore/friend_connection.h
index ecfc55ab..cbc6b9a1 100644
--- a/toxcore/friend_connection.h
+++ b/toxcore/friend_connection.h
@@ -25,9 +25,9 @@
 #ifndef FRIEND_CONNECTION_H
 #define FRIEND_CONNECTION_H
 
-#include "net_crypto.h"
 #include "DHT.h"
 #include "LAN_discovery.h"
+#include "net_crypto.h"
 #include "onion_client.h"
 
 
diff --git a/toxcore/list.h b/toxcore/list.h
index b04177e1..aac72e81 100644
--- a/toxcore/list.h
+++ b/toxcore/list.h
@@ -26,8 +26,8 @@
 #ifndef LIST_H
 #define LIST_H
 
-#include <stdlib.h>
 #include <stdint.h>
+#include <stdlib.h>
 #include <string.h>
 
 typedef struct {
diff --git a/toxcore/net_crypto.c b/toxcore/net_crypto.c
index 8ae8acf8..63043494 100644
--- a/toxcore/net_crypto.c
+++ b/toxcore/net_crypto.c
@@ -27,9 +27,9 @@
 #include "config.h"
 #endif
 
+#include "math.h"
 #include "net_crypto.h"
 #include "util.h"
-#include "math.h"
 
 static uint8_t crypt_connection_id_not_valid(const Net_Crypto *c, int crypt_connection_id)
 {
diff --git a/toxcore/net_crypto.h b/toxcore/net_crypto.h
index 9be71020..6a3ba40f 100644
--- a/toxcore/net_crypto.h
+++ b/toxcore/net_crypto.h
@@ -24,11 +24,11 @@
 #ifndef NET_CRYPTO_H
 #define NET_CRYPTO_H
 
+#include <pthread.h>
 #include "DHT.h"
 #include "LAN_discovery.h"
 #include "TCP_connection.h"
 #include "logger.h"
-#include <pthread.h>
 
 #define CRYPTO_CONN_NO_CONNECTION 0
 #define CRYPTO_CONN_COOKIE_REQUESTING 1 //send cookie request packets
diff --git a/toxcore/network.h b/toxcore/network.h
index 1cd1c999..5cc16523 100644
--- a/toxcore/network.h
+++ b/toxcore/network.h
@@ -25,15 +25,16 @@
 #define NETWORK_H
 
 #ifdef PLAN9
-#include <u.h> //Plan 9 requires this is imported first
+#include <u.h> // Plan 9 requires this is imported first
+// Comment line here to avoid reordering by source code formatters.
 #include <libc.h>
 #endif
 
 #include "logger.h"
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
@@ -42,8 +43,8 @@
 //Windows XP
 #define WINVER 0x0501
 #endif
-#include <winsock2.h>
 #include <windows.h>
+#include <winsock2.h>
 #include <ws2tcpip.h>
 
 #ifndef IPV6_V6ONLY
@@ -60,14 +61,14 @@ typedef short sa_family_t;
 
 #else // Linux includes
 
-#include <fcntl.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <errno.h>
+#include <fcntl.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#include <netdb.h>
 #include <unistd.h>
 
 typedef int sock_t;
diff --git a/toxcore/onion_announce.c b/toxcore/onion_announce.c
index 08492bb9..cebd56bb 100644
--- a/toxcore/onion_announce.c
+++ b/toxcore/onion_announce.c
@@ -23,8 +23,8 @@
 #include "config.h"
 #endif
 
-#include "onion_announce.h"
 #include "LAN_discovery.h"
+#include "onion_announce.h"
 #include "util.h"
 
 #define PING_ID_TIMEOUT 20
diff --git a/toxcore/onion_client.c b/toxcore/onion_client.c
index c6528c97..9d573240 100644
--- a/toxcore/onion_client.c
+++ b/toxcore/onion_client.c
@@ -24,9 +24,9 @@
 #include "config.h"
 #endif
 
+#include "LAN_discovery.h"
 #include "onion_client.h"
 #include "util.h"
-#include "LAN_discovery.h"
 
 /* defines for the array size and
    timeout for onion announce packets. */
diff --git a/toxcore/onion_client.h b/toxcore/onion_client.h
index 91056a09..cdf2c16f 100644
--- a/toxcore/onion_client.h
+++ b/toxcore/onion_client.h
@@ -24,8 +24,8 @@
 #ifndef ONION_CLIENT_H
 #define ONION_CLIENT_H
 
-#include "onion_announce.h"
 #include "net_crypto.h"
+#include "onion_announce.h"
 #include "ping_array.h"
 
 #define MAX_ONION_CLIENTS 8
diff --git a/toxcore/ping.c b/toxcore/ping.c
index 8993c6b2..a0cfbf18 100644
--- a/toxcore/ping.c
+++ b/toxcore/ping.c
@@ -33,8 +33,8 @@
 #include "ping.h"
 
 #include "network.h"
-#include "util.h"
 #include "ping_array.h"
+#include "util.h"
 
 #define PING_NUM_MAX 512
 
diff --git a/toxcore/ping_array.c b/toxcore/ping_array.c
index 59eb7018..8c5d72e9 100644
--- a/toxcore/ping_array.c
+++ b/toxcore/ping_array.c
@@ -26,8 +26,8 @@
 #include "config.h"
 #endif
 
-#include "ping_array.h"
 #include "crypto_core.h"
+#include "ping_array.h"
 #include "util.h"
 
 static void clear_entry(Ping_Array *array, uint32_t index)
diff --git a/toxcore/util.h b/toxcore/util.h
index bdbf7d3b..17b1a27b 100644
--- a/toxcore/util.h
+++ b/toxcore/util.h
@@ -25,9 +25,9 @@
 #ifndef __UTIL_H__
 #define __UTIL_H__
 
+#include <pthread.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <pthread.h>
 
 #define MIN(a,b) (((a)<(b))?(a):(b))
 #define PAIR(TYPE1__, TYPE2__) struct { TYPE1__ first; TYPE2__ second; }
diff --git a/toxencryptsave/toxencryptsave.c b/toxencryptsave/toxencryptsave.c
index e62e2283..bcbe9518 100644
--- a/toxencryptsave/toxencryptsave.c
+++ b/toxencryptsave/toxencryptsave.c
@@ -25,14 +25,14 @@
 #include "config.h"
 #endif
 
-#include "toxencryptsave.h"
-#include "defines.h"
 #include "../toxcore/crypto_core.h"
+#include "defines.h"
+#include "toxencryptsave.h"
 #define SET_ERROR_PARAMETER(param, x) {if(param) {*param = x;}}
 
 #ifdef VANILLA_NACL
-#include "crypto_pwhash_scryptsalsa208sha256/crypto_pwhash_scryptsalsa208sha256.h"
 #include <crypto_hash_sha256.h>
+#include "crypto_pwhash_scryptsalsa208sha256/crypto_pwhash_scryptsalsa208sha256.h"
 #endif
 
 #if TOX_PASS_SALT_LENGTH != crypto_pwhash_scryptsalsa208sha256_SALTBYTES
diff --git a/toxencryptsave/toxencryptsave.h b/toxencryptsave/toxencryptsave.h
index cf191810..6451f3f5 100644
--- a/toxencryptsave/toxencryptsave.h
+++ b/toxencryptsave/toxencryptsave.h
@@ -28,9 +28,9 @@
 extern "C" {
 #endif
 
-#include <stdint.h>
-#include <stddef.h>
 #include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #ifndef TOX_DEFINED
 #define TOX_DEFINED