sort includes

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
 

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 <assert.h>
+#include <math.h>
+#include <pthread.h>
 #include <stdbool.h>
+#include <stdlib.h>
 #include <string.h>
-#include <pthread.h>
 #include <unistd.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <math.h>
 
 extern struct user_settings *user_settings;
 extern struct Winthread Winthread;

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)
 {

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

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;
 

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.

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;

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"

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 */

src/chat_commands.c

@@ -23,15 +23,15 @@
 #include <stdlib.h>
 #include <string.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 "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"
 
 extern ToxWindow *prompt;
 extern FriendsList Friends;

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]);

src/conference.c

@@ -24,14 +24,14 @@
 #define _GNU_SOURCE    /* needed for strcasestr() and wcswidth() */
 #endif
 
+#include <assert.h>
+#include <inttypes.h>
+#include <math.h>
 #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 <wchar.h>
 
 #ifdef AUDIO
 #ifdef __APPLE__
@@ -47,21 +47,21 @@
 #endif /* __APPLE__ */
 #endif /* AUDIO */
 
-#include "windows.h"
-#include "toxic.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 "conference.h"
+#include "notify.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 "toxic.h"
+#include "toxic_strings.h"
+#include "windows.h"
 
 extern char *DATA_FILE;
 

src/conference_commands.c

@@ -20,15 +20,15 @@
  *
  */
 
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 
-#include "toxic.h"
-#include "windows.h"
+#include "conference.h"
 #include "line_info.h"
-#include "misc_tools.h"
 #include "log.h"
-#include "conference.h"
+#include "misc_tools.h"
+#include "toxic.h"
+#include "windows.h"
 
 static void print_err(ToxWindow *self, const char *error_str)
 {

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]);

src/configdir.c

@@ -20,18 +20,18 @@
  *
  */
 
-#include <string.h>
-#include <stdlib.h>
+#include <errno.h>
+#include <pwd.h>
 #include <stdio.h>
-#include <sys/types.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/stat.h>
-#include <errno.h>
+#include <sys/types.h>
 #include <unistd.h>
-#include <pwd.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)

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"
 

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;

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;