diff --git a/src/audio_call.c b/src/audio_call.c
index c00c74b..974a3bf 100644
--- a/src/audio_call.c
+++ b/src/audio_call.c
@@ -20,17 +20,17 @@
  *
  */
 
-#include "toxic.h"
-#include "windows.h"
 #include "audio_call.h"
 #include "audio_device.h"
 #include "chat_commands.h"
+#include "chat.h"
+#include "friendlist.h"
 #include "global_commands.h"
 #include "line_info.h"
-#include "notify.h"
-#include "friendlist.h"
-#include "chat.h"
 #include "misc_tools.h"
+#include "notify.h"
+#include "toxic.h"
+#include "windows.h"
 
 #ifdef AUDIO
 
diff --git a/src/audio_device.c b/src/audio_device.c
index 0d6558d..e7dfdb2 100644
--- a/src/audio_device.c
+++ b/src/audio_device.c
@@ -23,8 +23,8 @@
 #include "audio_device.h"
 
 #include "line_info.h"
-#include "settings.h"
 #include "misc_tools.h"
+#include "settings.h"
 
 #include <AL/al.h>
 #include <AL/alc.h>
@@ -33,13 +33,13 @@
 #include <AL/alext.h>
 #endif /* ALC_ALL_DEVICES_SPECIFIER */
 
-#include <stdbool.h>
-#include <string.h>
-#include <pthread.h>
-#include <unistd.h>
-#include <stdlib.h>
 #include <assert.h>
 #include <math.h>
+#include <pthread.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 extern struct user_settings *user_settings;
 extern struct Winthread Winthread;
diff --git a/src/autocomplete.c b/src/autocomplete.c
index 1ca7c6b..4a23fc0 100644
--- a/src/autocomplete.c
+++ b/src/autocomplete.c
@@ -20,9 +20,9 @@
  *
  */
 
+#include <limits.h>
 #include <stdlib.h>
 #include <string.h>
-#include <limits.h>
 
 #ifdef __APPLE__
 #include <sys/types.h>
@@ -31,12 +31,12 @@
 #include <dirent.h>
 #endif /* __APPLE__ */
 
-#include "windows.h"
-#include "toxic.h"
-#include "misc_tools.h"
-#include "line_info.h"
-#include "execute.h"
 #include "configdir.h"
+#include "execute.h"
+#include "line_info.h"
+#include "misc_tools.h"
+#include "toxic.h"
+#include "windows.h"
 
 static void print_ac_matches(ToxWindow *self, Tox *m, char **list, size_t n_matches)
 {
diff --git a/src/autocomplete.h b/src/autocomplete.h
index 022aa40..7c5d54b 100644
--- a/src/autocomplete.h
+++ b/src/autocomplete.h
@@ -23,6 +23,8 @@
 #ifndef AUTOCOMPLETE_H
 #define AUTOCOMPLETE_H
 
+#include "windows.h"
+
 /*
  * Looks for all instances in list that begin with the last entered word in line according to pos,
  * then fills line with the complete word. e.g. "Hello jo" would complete the line
diff --git a/src/avatars.c b/src/avatars.c
index d63eeed..2365c07 100644
--- a/src/avatars.c
+++ b/src/avatars.c
@@ -20,14 +20,14 @@
  *
  */
 
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
-#include "misc_tools.h"
+#include "avatars.h"
 #include "file_transfers.h"
 #include "friendlist.h"
-#include "avatars.h"
+#include "misc_tools.h"
 
 extern FriendsList Friends;
 
diff --git a/src/avatars.h b/src/avatars.h
index 1017cb7..8a5f17e 100644
--- a/src/avatars.h
+++ b/src/avatars.h
@@ -23,6 +23,8 @@
 #ifndef AVATARS_H
 #define AVATARS_H
 
+#include "file_transfers.h"
+
 #define MAX_AVATAR_FILE_SIZE 65536
 
 /* Sends avatar to friendnum.
diff --git a/src/bootstrap.c b/src/bootstrap.c
index 10cedab..e724e07 100644
--- a/src/bootstrap.c
+++ b/src/bootstrap.c
@@ -20,24 +20,24 @@
  *
  */
 
-#include <stdlib.h>
-#include <string.h>
-#include <stdbool.h>
+#include <arpa/inet.h>
 #include <limits.h>
 #include <netinet/in.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/socket.h>
-#include <arpa/inet.h>
 
 #include <curl/curl.h>
 #include <tox/tox.h>
 
-#include "line_info.h"
-#include "windows.h"
-#include "misc_tools.h"
 #include "configdir.h"
 #include "curl_util.h"
-#include "settings.h"
+#include "line_info.h"
+#include "misc_tools.h"
 #include "prompt.h"
+#include "settings.h"
+#include "windows.h"
 
 extern struct arg_opts arg_opts;
 extern struct user_settings *user_settings;
diff --git a/src/chat.c b/src/chat.c
index b2b1d4c..2f318f8 100644
--- a/src/chat.c
+++ b/src/chat.c
@@ -24,28 +24,28 @@
 #define _GNU_SOURCE    /* needed for wcswidth() */
 #endif
 
+#include <assert.h>
+#include <limits.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <wchar.h>
-#include <assert.h>
-#include <limits.h>
 
-#include "toxic.h"
-#include "windows.h"
+#include "autocomplete.h"
 #include "execute.h"
-#include "misc_tools.h"
 #include "file_transfers.h"
 #include "friendlist.h"
-#include "toxic_strings.h"
-#include "log.h"
-#include "line_info.h"
-#include "settings.h"
-#include "input.h"
 #include "help.h"
-#include "autocomplete.h"
-#include "notify.h"
+#include "input.h"
+#include "line_info.h"
+#include "log.h"
 #include "message_queue.h"
+#include "misc_tools.h"
+#include "notify.h"
+#include "settings.h"
+#include "toxic.h"
+#include "toxic_strings.h"
+#include "windows.h"
 
 #ifdef AUDIO
 #include "audio_call.h"
diff --git a/src/chat.h b/src/chat.h
index db899b5..d8d774f 100644
--- a/src/chat.h
+++ b/src/chat.h
@@ -23,8 +23,8 @@
 #ifndef CHAT_H
 #define CHAT_H
 
-#include "windows.h"
 #include "toxic.h"
+#include "windows.h"
 
 /* set CTRL to -1 if we don't want to send a control signal.
    set msg to NULL if we don't want to display a message */
diff --git a/src/chat_commands.c b/src/chat_commands.c
index ebc5415..e80af9f 100644
--- a/src/chat_commands.c
+++ b/src/chat_commands.c
@@ -23,15 +23,15 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "chat.h"
+#include "conference.h"
+#include "execute.h"
+#include "file_transfers.h"
+#include "friendlist.h"
+#include "line_info.h"
+#include "misc_tools.h"
 #include "toxic.h"
 #include "windows.h"
-#include "misc_tools.h"
-#include "friendlist.h"
-#include "execute.h"
-#include "line_info.h"
-#include "conference.h"
-#include "chat.h"
-#include "file_transfers.h"
 
 extern ToxWindow *prompt;
 extern FriendsList Friends;
diff --git a/src/chat_commands.h b/src/chat_commands.h
index 6e45eb6..1c71686 100644
--- a/src/chat_commands.h
+++ b/src/chat_commands.h
@@ -23,8 +23,8 @@
 #ifndef CHAT_COMMANDS_H
 #define CHAT_COMMANDS_H
 
-#include "windows.h"
 #include "toxic.h"
+#include "windows.h"
 
 void cmd_cancelfile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_conference_invite(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
diff --git a/src/conference.c b/src/conference.c
index 1e2edd1..ac21a90 100644
--- a/src/conference.c
+++ b/src/conference.c
@@ -24,14 +24,14 @@
 #define _GNU_SOURCE    /* needed for strcasestr() and wcswidth() */
 #endif
 
-#include <stdlib.h>
-#include <string.h>
 #include <assert.h>
-#include <time.h>
-#include <wchar.h>
-#include <unistd.h>
 #include <inttypes.h>
 #include <math.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+#include <wchar.h>
 
 #ifdef AUDIO
 #ifdef __APPLE__
@@ -47,21 +47,21 @@
 #endif /* __APPLE__ */
 #endif /* AUDIO */
 
-#include "windows.h"
-#include "toxic.h"
-#include "execute.h"
-#include "misc_tools.h"
-#include "conference.h"
-#include "prompt.h"
-#include "toxic_strings.h"
-#include "log.h"
-#include "line_info.h"
-#include "settings.h"
-#include "input.h"
-#include "help.h"
-#include "notify.h"
-#include "autocomplete.h"
 #include "audio_device.h"
+#include "autocomplete.h"
+#include "conference.h"
+#include "execute.h"
+#include "help.h"
+#include "input.h"
+#include "line_info.h"
+#include "log.h"
+#include "misc_tools.h"
+#include "notify.h"
+#include "prompt.h"
+#include "settings.h"
+#include "toxic.h"
+#include "toxic_strings.h"
+#include "windows.h"
 
 extern char *DATA_FILE;
 
diff --git a/src/conference_commands.c b/src/conference_commands.c
index d7469fc..4bd9f2d 100644
--- a/src/conference_commands.c
+++ b/src/conference_commands.c
@@ -20,15 +20,15 @@
  *
  */
 
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 
+#include "conference.h"
+#include "line_info.h"
+#include "log.h"
+#include "misc_tools.h"
 #include "toxic.h"
 #include "windows.h"
-#include "line_info.h"
-#include "misc_tools.h"
-#include "log.h"
-#include "conference.h"
 
 static void print_err(ToxWindow *self, const char *error_str)
 {
diff --git a/src/conference_commands.h b/src/conference_commands.h
index de08084..744b5c2 100644
--- a/src/conference_commands.h
+++ b/src/conference_commands.h
@@ -23,8 +23,8 @@
 #ifndef CONFERENCE_COMMANDS_H
 #define CONFERENCE_COMMANDS_H
 
-#include "windows.h"
 #include "toxic.h"
+#include "windows.h"
 
 void cmd_conference_set_title(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_enable_audio(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX_STR_SIZE]);
diff --git a/src/configdir.c b/src/configdir.c
index 8d69dc6..7215e75 100644
--- a/src/configdir.c
+++ b/src/configdir.c
@@ -20,18 +20,18 @@
  *
  */
 
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <errno.h>
-#include <unistd.h>
 #include <pwd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 
-#include "toxic.h"
 #include "configdir.h"
 #include "misc_tools.h"
+#include "toxic.h"
 
 /* get the user's home directory. */
 void get_home_dir(char *home, int size)
diff --git a/src/curl_util.h b/src/curl_util.h
index 2590308..87bc3aa 100644
--- a/src/curl_util.h
+++ b/src/curl_util.h
@@ -23,6 +23,8 @@
 #ifndef CURL_UTIL_H
 #define CURL_UTIL_H
 
+#include <stdint.h>
+
 /* List based on Mozilla's recommended configurations for modern browsers */
 #define TLS_CIPHER_SUITE_LIST "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK"
 
diff --git a/src/execute.c b/src/execute.c
index ac0d69a..7e41b55 100644
--- a/src/execute.c
+++ b/src/execute.c
@@ -20,20 +20,20 @@
  *
  */
 
+#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
 
-#include "toxic.h"
-#include "windows.h"
-#include "execute.h"
+#include "api.h"
 #include "chat_commands.h"
+#include "execute.h"
 #include "global_commands.h"
 #include "conference_commands.h"
 #include "line_info.h"
 #include "misc_tools.h"
 #include "notify.h"
-#include "api.h"
+#include "toxic.h"
+#include "windows.h"
 
 struct cmd_func {
     const char *name;
diff --git a/src/file_transfers.c b/src/file_transfers.c
index ae6e34e..9393aa7 100644
--- a/src/file_transfers.c
+++ b/src/file_transfers.c
@@ -20,18 +20,18 @@
  *
  */
 
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 #include <time.h>
 #include <unistd.h>
 
-#include "toxic.h"
-#include "windows.h"
-#include "friendlist.h"
 #include "file_transfers.h"
+#include "friendlist.h"
 #include "line_info.h"
 #include "misc_tools.h"
 #include "notify.h"
+#include "toxic.h"
+#include "windows.h"
 
 extern FriendsList Friends;
 
diff --git a/src/file_transfers.h b/src/file_transfers.h
index 9a46dc4..448777d 100644
--- a/src/file_transfers.h
+++ b/src/file_transfers.h
@@ -25,9 +25,9 @@
 
 #include <limits.h>
 
+#include "notify.h"
 #include "toxic.h"
 #include "windows.h"
-#include "notify.h"
 
 #define KiB 1024
 #define MiB 1048576       /* 1024^2 */
diff --git a/src/friendlist.c b/src/friendlist.c
index e56cde9..42a88f5 100644
--- a/src/friendlist.c
+++ b/src/friendlist.c
@@ -20,26 +20,26 @@
  *
  */
 
-#include <string.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <time.h>
 #include <arpa/inet.h>
 #include <assert.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
 
 #include <tox/tox.h>
 
-#include "toxic.h"
-#include "windows.h"
+#include "avatars.h"
 #include "chat.h"
 #include "friendlist.h"
-#include "misc_tools.h"
-#include "line_info.h"
-#include "settings.h"
-#include "notify.h"
 #include "help.h"
+#include "line_info.h"
 #include "log.h"
-#include "avatars.h"
+#include "misc_tools.h"
+#include "notify.h"
+#include "settings.h"
+#include "toxic.h"
+#include "windows.h"
 
 #ifdef AUDIO
 #include "audio_call.h"
diff --git a/src/friendlist.h b/src/friendlist.h
index 9f1b05a..4068dae 100644
--- a/src/friendlist.h
+++ b/src/friendlist.h
@@ -25,9 +25,9 @@
 
 #include <time.h>
 
+#include "file_transfers.h"
 #include "toxic.h"
 #include "windows.h"
-#include "file_transfers.h"
 
 struct LastOnline {
     uint64_t last_on;
diff --git a/src/global_commands.c b/src/global_commands.c
index a9efee1..6918465 100644
--- a/src/global_commands.c
+++ b/src/global_commands.c
@@ -23,20 +23,20 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "toxic.h"
-#include "windows.h"
-#include "misc_tools.h"
-#include "friendlist.h"
-#include "log.h"
-#include "line_info.h"
-#include "conference.h"
-#include "prompt.h"
-#include "help.h"
-#include "term_mplex.h"
 #include "avatars.h"
+#include "conference.h"
+#include "friendlist.h"
+#include "help.h"
+#include "line_info.h"
+#include "log.h"
+#include "misc_tools.h"
 #include "name_lookup.h"
+#include "prompt.h"
 #include "qr_code.h"
+#include "term_mplex.h"
+#include "toxic.h"
 #include "toxic_strings.h"
+#include "windows.h"
 
 extern char *DATA_FILE;
 extern ToxWindow *prompt;
diff --git a/src/global_commands.h b/src/global_commands.h
index 02170f2..33bec86 100644
--- a/src/global_commands.h
+++ b/src/global_commands.h
@@ -23,8 +23,8 @@
 #ifndef GLOBAL_COMMANDS_H
 #define GLOBAL_COMMANDS_H
 
-#include "windows.h"
 #include "toxic.h"
+#include "windows.h"
 
 void cmd_accept(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
 void cmd_add(WINDOW *, ToxWindow *, Tox *, int argc, char (*argv)[MAX_STR_SIZE]);
diff --git a/src/help.c b/src/help.c
index e9076b6..a136cd2 100644
--- a/src/help.c
+++ b/src/help.c
@@ -22,10 +22,10 @@
 
 #include <string.h>
 
-#include "windows.h"
-#include "toxic.h"
 #include "help.h"
 #include "misc_tools.h"
+#include "toxic.h"
+#include "windows.h"
 
 #ifdef PYTHON
 #include "api.h"
diff --git a/src/input.c b/src/input.c
index 67e2f13..ae343ca 100644
--- a/src/input.c
+++ b/src/input.c
@@ -26,14 +26,14 @@
 
 #include <wchar.h>
 
-#include "toxic.h"
-#include "windows.h"
-#include "misc_tools.h"
-#include "toxic_strings.h"
-#include "line_info.h"
-#include "notify.h"
 #include "conference.h"
+#include "line_info.h"
+#include "misc_tools.h"
+#include "notify.h"
 #include "settings.h"
+#include "toxic.h"
+#include "toxic_strings.h"
+#include "windows.h"
 
 extern struct user_settings *user_settings;
 
diff --git a/src/line_info.c b/src/line_info.c
index 6c19a1d..cc545c0 100644
--- a/src/line_info.c
+++ b/src/line_info.c
@@ -20,19 +20,19 @@
  *
  */
 
+#include <stdarg.h>
+#include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdbool.h>
-#include <stdarg.h>
 
-#include "toxic.h"
-#include "windows.h"
-#include "line_info.h"
 #include "conference.h"
-#include "settings.h"
-#include "notify.h"
+#include "line_info.h"
 #include "message_queue.h"
 #include "misc_tools.h"
+#include "notify.h"
+#include "settings.h"
+#include "toxic.h"
+#include "windows.h"
 
 extern struct user_settings *user_settings;
 
diff --git a/src/line_info.h b/src/line_info.h
index 3a95ec3..24beb6c 100644
--- a/src/line_info.h
+++ b/src/line_info.h
@@ -23,8 +23,8 @@
 #ifndef LINE_INFO_H
 #define LINE_INFO_H
 
-#include "windows.h"
 #include "toxic.h"
+#include "windows.h"
 
 #define MAX_HISTORY 100000
 #define MIN_HISTORY 40
diff --git a/src/log.c b/src/log.c
index 762b035..0d0eab7 100644
--- a/src/log.c
+++ b/src/log.c
@@ -22,16 +22,16 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
 #include <sys/stat.h>
+#include <time.h>
 
 #include "configdir.h"
+#include "line_info.h"
+#include "log.h"
+#include "misc_tools.h"
+#include "settings.h"
 #include "toxic.h"
 #include "windows.h"
-#include "misc_tools.h"
-#include "log.h"
-#include "settings.h"
-#include "line_info.h"
 
 extern struct user_settings *user_settings;
 
diff --git a/src/message_queue.c b/src/message_queue.c
index 177c79b..fadd099 100644
--- a/src/message_queue.c
+++ b/src/message_queue.c
@@ -22,12 +22,12 @@
 
 #include <stdlib.h>
 
-#include "toxic.h"
-#include "windows.h"
-#include "message_queue.h"
-#include "misc_tools.h"
 #include "line_info.h"
 #include "log.h"
+#include "message_queue.h"
+#include "misc_tools.h"
+#include "toxic.h"
+#include "windows.h"
 
 void cqueue_cleanup(struct chat_queue *q)
 {
diff --git a/src/misc_tools.c b/src/misc_tools.c
index 0586eaa..9cea7fe 100644
--- a/src/misc_tools.c
+++ b/src/misc_tools.c
@@ -20,18 +20,19 @@
  *
  */
 
-#include <stdlib.h>
+#include <arpa/inet.h>
 #include <ctype.h>
-#include <string.h>
-#include <time.h>
 #include <limits.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/stat.h>
+#include <time.h>
 
-#include "toxic.h"
-#include "windows.h"
+#include "file_transfers.h"
 #include "misc_tools.h"
 #include "settings.h"
-#include "file_transfers.h"
+#include "toxic.h"
+#include "windows.h"
 
 extern ToxWindow *prompt;
 extern struct user_settings *user_settings;
diff --git a/src/misc_tools.h b/src/misc_tools.h
index c9cc21e..2d3e49b 100644
--- a/src/misc_tools.h
+++ b/src/misc_tools.h
@@ -24,8 +24,8 @@
 
 #include <sys/stat.h>
 
-#include "windows.h"
 #include "toxic.h"
+#include "windows.h"
 
 #ifndef MIN
 #define MIN(x, y) (((x) < (y)) ? (x) : (y))
diff --git a/src/name_lookup.c b/src/name_lookup.c
index 6db7e90..45e548d 100644
--- a/src/name_lookup.c
+++ b/src/name_lookup.c
@@ -20,18 +20,18 @@
  *
  */
 
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
 #include <curl/curl.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
 
-#include "toxic.h"
-#include "windows.h"
-#include "line_info.h"
-#include "global_commands.h"
-#include "misc_tools.h"
 #include "configdir.h"
 #include "curl_util.h"
+#include "global_commands.h"
+#include "line_info.h"
+#include "misc_tools.h"
+#include "toxic.h"
+#include "windows.h"
 
 extern struct arg_opts arg_opts;
 extern struct Winthread Winthread;
diff --git a/src/notify.c b/src/notify.c
index 28c799e..f5b015f 100644
--- a/src/notify.c
+++ b/src/notify.c
@@ -20,21 +20,21 @@
  *
  */
 
+#include <assert.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <unistd.h>
-#include <stdarg.h>
-#include <time.h>
-#include <assert.h>
 #include <sys/stat.h>
+#include <time.h>
+#include <unistd.h>
 
-#include "notify.h"
 #include "audio_device.h"
-#include "settings.h"
 #include "line_info.h"
 #include "misc_tools.h"
+#include "notify.h"
+#include "settings.h"
 #include "xtra.h"
 
 #if defined(AUDIO) || defined(SOUND_NOTIFY)
diff --git a/src/prompt.c b/src/prompt.c
index 3a79a9b..b5960ae 100644
--- a/src/prompt.c
+++ b/src/prompt.c
@@ -28,20 +28,20 @@
 #include <string.h>
 #include <wchar.h>
 
-#include "toxic.h"
-#include "windows.h"
-#include "prompt.h"
-#include "friendlist.h"
-#include "execute.h"
-#include "misc_tools.h"
-#include "toxic_strings.h"
-#include "log.h"
-#include "line_info.h"
-#include "settings.h"
-#include "input.h"
-#include "help.h"
-#include "notify.h"
 #include "autocomplete.h"
+#include "execute.h"
+#include "friendlist.h"
+#include "help.h"
+#include "input.h"
+#include "line_info.h"
+#include "log.h"
+#include "misc_tools.h"
+#include "notify.h"
+#include "prompt.h"
+#include "settings.h"
+#include "toxic.h"
+#include "toxic_strings.h"
+#include "windows.h"
 
 extern ToxWindow *prompt;
 extern struct user_settings *user_settings;
diff --git a/src/qr_code.c b/src/qr_code.c
index 6e957af..f98c2c5 100644
--- a/src/qr_code.c
+++ b/src/qr_code.c
@@ -22,14 +22,14 @@
 
 #ifdef QRCODE
 
-#include <stdlib.h>
 #include <qrencode.h>
 #include <stdbool.h>
+#include <stdlib.h>
 #include <string.h>
 
+#include "qr_code.h"
 #include "toxic.h"
 #include "windows.h"
-#include "qr_code.h"
 
 #ifdef QRPNG
 #include <png.h>
diff --git a/src/settings.c b/src/settings.c
index 6ba2aa8..cba1264 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -20,23 +20,23 @@
  *
  */
 
+#include <ctype.h>
+#include <libconfig.h>
 #include <stdlib.h>
 #include <string.h>
-#include <libconfig.h>
-#include <ctype.h>
 
+#include "configdir.h"
+#include "misc_tools.h"
+#include "notify.h"
 #include "toxic.h"
 #include "windows.h"
-#include "configdir.h"
-#include "notify.h"
-#include "misc_tools.h"
 
 #ifdef AUDIO
 #include "audio_device.h"
 #endif /* AUDIO */
 
-#include "settings.h"
 #include "line_info.h"
+#include "settings.h"
 
 #ifndef PACKAGE_DATADIR
 #define PACKAGE_DATADIR "."
diff --git a/src/term_mplex.c b/src/term_mplex.c
index 0c0591d..a0ce92e 100644
--- a/src/term_mplex.c
+++ b/src/term_mplex.c
@@ -26,18 +26,18 @@
 #include <string.h> /* strlen, strcpy, strstr, strchr, strrchr, strcat, strncmp */
 
 #include <pthread.h>
-#include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 #include <time.h>
 #include <unistd.h>
 
 #include <tox/tox.h>
 
 #include "execute.h"
-#include "windows.h"
+#include "settings.h"
 #include "term_mplex.h"
 #include "toxic.h"
-#include "settings.h"
+#include "windows.h"
 
 extern struct ToxWindow *prompt;
 extern struct user_settings *user_settings;
diff --git a/src/toxic.c b/src/toxic.c
index 511fc43..fd0a5b2 100644
--- a/src/toxic.c
+++ b/src/toxic.c
@@ -20,50 +20,50 @@
  *
  */
 
+#include <ctype.h>
 #include <curses.h>
 #include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <getopt.h>
+#include <limits.h>
+#include <locale.h>
+#include <netdb.h>
+#include <pthread.h>
+#include <signal.h>
+#include <stdarg.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <stdarg.h>
-#include <signal.h>
-#include <locale.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <time.h>
-#include <pthread.h>
-#include <getopt.h>
-#include <netdb.h>
+#include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <unistd.h>
-#include <limits.h>
 #include <termios.h>
-#include <ctype.h>
+#include <time.h>
+#include <unistd.h>
 
 #include <curl/curl.h>
-#include <tox/tox.h>
 #include <tox/toxencryptsave.h>
+#include <tox/tox.h>
 
+#include "audio_device.h"
+#include "bootstrap.h"
+#include "conference.h"
 #include "configdir.h"
+#include "execute.h"
+#include "file_transfers.h"
+#include "friendlist.h"
+#include "line_info.h"
+#include "log.h"
+#include "message_queue.h"
+#include "misc_tools.h"
+#include "name_lookup.h"
+#include "notify.h"
+#include "prompt.h"
+#include "settings.h"
+#include "term_mplex.h"
 #include "toxic.h"
 #include "windows.h"
-#include "friendlist.h"
-#include "prompt.h"
-#include "misc_tools.h"
-#include "conference.h"
-#include "file_transfers.h"
-#include "line_info.h"
-#include "settings.h"
-#include "log.h"
-#include "notify.h"
-#include "audio_device.h"
-#include "message_queue.h"
-#include "execute.h"
-#include "term_mplex.h"
-#include "name_lookup.h"
-#include "bootstrap.h"
 
 #ifdef X11
 #include "xtra.h"
diff --git a/src/toxic_strings.c b/src/toxic_strings.c
index f1cdf00..2ccccc2 100644
--- a/src/toxic_strings.c
+++ b/src/toxic_strings.c
@@ -24,11 +24,11 @@
 #include <string.h>
 #include <wchar.h>
 
-#include "toxic.h"
-#include "windows.h"
 #include "misc_tools.h"
-#include "toxic_strings.h"
 #include "notify.h"
+#include "toxic.h"
+#include "toxic_strings.h"
+#include "windows.h"
 
 /* Adds char to line at pos. Return 0 on success, -1 if line buffer is full */
 int add_char_to_buf(ChatContext *ctx, wint_t ch)
diff --git a/src/video_call.c b/src/video_call.c
index 944e4ca..143829d 100644
--- a/src/video_call.c
+++ b/src/video_call.c
@@ -20,23 +20,23 @@
  *
  */
 
-#include "toxic.h"
-#include "windows.h"
-#include "video_call.h"
-#include "video_device.h"
 #include "chat_commands.h"
 #include "global_commands.h"
 #include "line_info.h"
-#include "notify.h"
 #include "misc_tools.h"
+#include "notify.h"
+#include "toxic.h"
+#include "video_call.h"
+#include "video_device.h"
+#include "windows.h"
 
-#include <stdbool.h>
-#include <curses.h>
-#include <string.h>
-#include <pthread.h>
-#include <unistd.h>
-#include <stdlib.h>
 #include <assert.h>
+#include <curses.h>
+#include <pthread.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #ifdef VIDEO
 
diff --git a/src/video_device.c b/src/video_device.c
index 7f1be5c..6b7bc69 100644
--- a/src/video_device.c
+++ b/src/video_device.c
@@ -20,8 +20,8 @@
  *
  */
 
-#include "video_device.h"
 #include "video_call.h"
+#include "video_device.h"
 
 #include <sys/ioctl.h>
 
@@ -30,13 +30,13 @@
 #if defined(__OSX__) || defined(__APPLE__)
 #import "osx_video.h"
 #else
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xos.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
 #include <fcntl.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <X11/Xlib.h>
+#include <X11/Xos.h>
+#include <X11/Xutil.h>
 #if defined(__OpenBSD__) || defined(__NetBSD__)
 #include <sys/videoio.h>
 #else
@@ -45,16 +45,15 @@
 #endif /* __OSX__ || __APPLE__ */
 
 #include "line_info.h"
-#include "settings.h"
 #include "misc_tools.h"
+#include "settings.h"
 
 #include <errno.h>
-
-#include <stdbool.h>
-#include <string.h>
 #include <pthread.h>
-#include <unistd.h>
+#include <stdbool.h>
 #include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #ifdef VIDEO
 
diff --git a/src/windows.c b/src/windows.c
index a05d377..a14ac15 100644
--- a/src/windows.c
+++ b/src/windows.c
@@ -20,22 +20,22 @@
  *
  */
 
+#include <ctype.h>
+#include <pthread.h>
 #include <stdlib.h>
 #include <string.h>
-#include <pthread.h>
-#include <ctype.h>
 
-#include "friendlist.h"
-#include "prompt.h"
-#include "toxic.h"
-#include "windows.h"
-#include "conference.h"
+#include "avatars.h"
 #include "chat.h"
+#include "conference.h"
+#include "file_transfers.h"
+#include "friendlist.h"
 #include "line_info.h"
 #include "misc_tools.h"
-#include "avatars.h"
+#include "prompt.h"
 #include "settings.h"
-#include "file_transfers.h"
+#include "toxic.h"
+#include "windows.h"
 
 extern char *DATA_FILE;
 extern struct Winthread Winthread;
diff --git a/src/windows.h b/src/windows.h
index 637e157..a887fc3 100644
--- a/src/windows.h
+++ b/src/windows.h
@@ -24,9 +24,9 @@
 #define WINDOWS_H
 
 #include <pthread.h>
-#include <wctype.h>
-#include <wchar.h>
 #include <signal.h>
+#include <wchar.h>
+#include <wctype.h>
 
 #include <tox/tox.h>
 
diff --git a/src/xtra.c b/src/xtra.c
index e0dfe3e..c1e1c82 100644
--- a/src/xtra.c
+++ b/src/xtra.c
@@ -20,19 +20,19 @@
  *
  */
 
-#include "xtra.h"
 #include "misc_tools.h"
+#include "xtra.h"
 
 #ifndef __APPLE__
 
-#include <X11/Xlib.h>
 #include <X11/Xatom.h>
+#include <X11/Xlib.h>
 
-#include <pthread.h>
 #include <assert.h>
+#include <pthread.h>
+#include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <stdio.h>
 
 
 const  Atom XtraTerminate = 1;