Clean up the include files to make them consistent.

src/espeak-ng.c

@@ -19,15 +19,15 @@
 
 #include "config.h"
 
+#include <ctype.h>
 #include <errno.h>
+#include <getopt.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
-#include <getopt.h>
-#include <time.h>
 #include <sys/stat.h>
+#include <time.h>
 
 #include <espeak-ng/espeak_ng.h>
 #include <espeak/speak_lib.h>

src/libespeak-ng/compiledata.c

@@ -19,14 +19,16 @@
 
 #include "config.h"
 
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
 #include <ctype.h>
-#include <stdlib.h>
+#include <errno.h>
 #include <stdarg.h>
-#include <time.h>
 #include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <time.h>
+#include <unistd.h>
 
 #include <espeak-ng/espeak_ng.h>
 #include <espeak/speak_lib.h>
@@ -38,9 +40,6 @@
 #include "voice.h"
 #include "spect.h"
 
-#include <sys/stat.h>
-#include <unistd.h>
-
 typedef struct {
 	unsigned int value;
 	char *name;

src/libespeak-ng/compiledict.c

@@ -20,13 +20,13 @@
 
 #include "config.h"
 
-#include <errno.h>
-#include <stdio.h>
 #include <ctype.h>
+#include <errno.h>
+#include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <wctype.h>
-#include <stdint.h>
 
 #include <espeak-ng/espeak_ng.h>
 #include <espeak/speak_lib.h>

src/libespeak-ng/compilembrola.c

@@ -20,10 +20,10 @@
 #include "config.h"
 
 #include <errno.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdint.h>
 
 #include <espeak-ng/espeak_ng.h>
 #include <espeak/speak_lib.h>

src/libespeak-ng/dictionary.c

@@ -19,14 +19,13 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <ctype.h>
+#include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdint.h>
-
-#include <wctype.h>
 #include <wchar.h>
+#include <wctype.h>
 
 #include <espeak-ng/espeak_ng.h>
 #include <espeak/speak_lib.h>

src/libespeak-ng/error.c

@@ -19,10 +19,10 @@
 #include "config.h"
 
 #include <errno.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
 #include <malloc.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
 
 #include <espeak-ng/espeak_ng.h>
 

src/libespeak-ng/espeak_api.c

@@ -20,17 +20,16 @@
 
 #include "config.h"
 
+#include <stdint.h>
+#include <stdlib.h>
+
 #include <espeak-ng/espeak_ng.h>
 #include <espeak/speak_lib.h>
 
-#include <stdlib.h>
-#include <stdint.h>
-
 #include "speech.h"
 #include "phoneme.h"
 #include "synthesize.h"
 #include "translate.h"
-
 #include "event.h"
 
 static espeak_ERROR status_to_espeak_error(espeak_ng_STATUS status)

src/libespeak-ng/espeak_command.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007, Gilles Casse <gcasse@oralux.org>
- * Copyright (C) 2013-2015 Reece H. Dunn
+ * Copyright (C) 2013-2016 Reece H. Dunn
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,14 +18,15 @@
 
 #include "config.h"
 
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+
 #include <espeak-ng/espeak_ng.h>
 
 #include "speech.h"
 #include "espeak_command.h"
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <wchar.h>
 
 static unsigned int my_current_text_id = 0;
 

src/libespeak-ng/event.c

@@ -20,15 +20,15 @@
 
 #include "config.h"
 
-#include <unistd.h>
 #include <assert.h>
-#include <string.h>
-#include <stdlib.h>
+#include <errno.h>
 #include <pthread.h>
 #include <semaphore.h>
-#include <sys/time.h>
-#include <errno.h>
 #include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/time.h>
+#include <unistd.h>
 
 #include <espeak-ng/espeak_ng.h>
 #include <espeak/speak_lib.h>

src/libespeak-ng/fifo.c

@@ -20,16 +20,16 @@
 
 #include "config.h"
 
-#include <unistd.h>
 #include <assert.h>
-#include <string.h>
-#include <stdlib.h>
+#include <errno.h>
 #include <pthread.h>
 #include <semaphore.h>
-#include <wchar.h>
-#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/time.h>
 #include <time.h>
+#include <unistd.h>
+#include <wchar.h>
 
 #include <espeak-ng/espeak_ng.h>
 

src/libespeak-ng/intonation.c

@@ -19,11 +19,11 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <wctype.h>
 #include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wctype.h>
 
 #include <espeak-ng/espeak_ng.h>
 #include <espeak/speak_lib.h>

src/libespeak-ng/klatt.c

@@ -25,11 +25,11 @@
 
 #include "config.h"
 
+#include <math.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <math.h>
 #include <string.h>
-#include <stdint.h>
 
 #include <espeak-ng/espeak_ng.h>
 #include <espeak/speak_lib.h>

src/libespeak-ng/mbrowrap.c

@@ -20,13 +20,11 @@
 #include "config.h"
 
 #if defined(_WIN32) || defined(_WIN64)
+
 #include <windows.h>
-#endif
 
 #include "mbrowrap.h"
 
-#if defined(_WIN32) || defined(_WIN64)
-
 HINSTANCE hinstDllMBR = NULL;
 
 BOOL load_MBR()
@@ -58,21 +56,22 @@ void unload_MBR()
 
 #else
 
-#include <espeak-ng/espeak_ng.h>
-
-#include "speech.h"
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <signal.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <poll.h>
-#include <errno.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <unistd.h>
+
+#include <espeak-ng/espeak_ng.h>
+
+#include "mbrowrap.h"
+#include "speech.h"
 
 /*
  * mbrola instance parameters

src/libespeak-ng/numbers.c

@@ -19,15 +19,14 @@
 
 #include "config.h"
 
-#include <stdbool.h>
-#include <stdio.h>
 #include <ctype.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdint.h>
-
-#include <wctype.h>
 #include <wchar.h>
+#include <wctype.h>
 
 #include <espeak-ng/espeak_ng.h>
 #include <espeak/speak_lib.h>

src/libespeak-ng/phonemelist.c

@@ -19,10 +19,10 @@
 
 #include "config.h"
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdint.h>
 
 #include <espeak-ng/espeak_ng.h>
 #include <espeak/speak_lib.h>

src/libespeak-ng/readclause.c

@@ -19,14 +19,16 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wctype.h>
-#include <wchar.h>
+#include <locale.h>
 #include <math.h>
 #include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <wchar.h>
+#include <wctype.h>
 
 #include <espeak-ng/espeak_ng.h>
 #include <espeak/speak_lib.h>
@@ -37,9 +39,6 @@
 #include "voice.h"
 #include "translate.h"
 
-#include <unistd.h>
-
-#include <locale.h>
 #define N_XML_BUF   500
 
 static const char *xmlbase = ""; // base URL from <speak>

src/libespeak-ng/setlengths.c

@@ -20,10 +20,10 @@
 #include "config.h"
 
 #include <errno.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <wctype.h>
 #include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <wctype.h>
 
 #include <espeak-ng/espeak_ng.h>
 #include <espeak/speak_lib.h>

src/libespeak-ng/spect.c

@@ -20,8 +20,11 @@
 #include "config.h"
 
 #include <errno.h>
-#include <stdio.h>
+#include <math.h>
 #include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include <espeak-ng/espeak_ng.h>
 #include <espeak/speak_lib.h>
@@ -32,10 +35,6 @@
 #include "voice.h"
 #include "spect.h"
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-
 extern double ConvertFromIeeeExtended(unsigned char *bytes);
 extern int PeaksToHarmspect(wavegen_peaks_t *peaks, int pitch, int *htab, int control);
 

src/libespeak-ng/speech.c

@@ -19,23 +19,18 @@
 
 #include "config.h"
 
-#include "errno.h"
-#include "stdio.h"
-#include "ctype.h"
-#include "string.h"
-#include "stdlib.h"
-#include "wchar.h"
-#include "locale.h"
 #include <assert.h>
-#include <time.h>
-
-#include <espeak-ng/espeak_ng.h>
-#include <espeak/speak_lib.h>
-
-#include "speech.h"
-
+#include <ctype.h>
+#include <errno.h>
+#include <locale.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/stat.h>
+#include <time.h>
 #include <unistd.h>
+#include <wchar.h>
+
 #ifdef PLATFORM_WINDOWS
 #include <fcntl.h>
 #include <io.h>
@@ -43,11 +38,14 @@
 #include <winreg.h>
 #endif
 
+#include <espeak-ng/espeak_ng.h>
+#include <espeak/speak_lib.h>
+
+#include "speech.h"
 #include "phoneme.h"
 #include "synthesize.h"
 #include "voice.h"
 #include "translate.h"
-
 #include "fifo.h"
 #include "event.h"
 #include "wave.h"

src/libespeak-ng/synth_mbrola.c

@@ -19,14 +19,14 @@
 
 #include "config.h"
 
-#include <errno.h>
-#include <stdio.h>
 #include <ctype.h>
-#include <wctype.h>
-#include <stdlib.h>
-#include <string.h>
+#include <errno.h>
 #include <math.h>
 #include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wctype.h>
 
 #include <espeak-ng/espeak_ng.h>
 #include <espeak/speak_lib.h>

src/libespeak-ng/synthdata.c

@@ -19,14 +19,14 @@
 
 #include "config.h"
 
+#include <ctype.h>
 #include <errno.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ctype.h>
-#include <wctype.h>
 #include <string.h>
-#include <stdint.h>
+#include <wctype.h>
 
 #include <espeak-ng/espeak_ng.h>
 #include <espeak/speak_lib.h>

src/libespeak-ng/synthesize.c

@@ -19,13 +19,13 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <ctype.h>
-#include <wctype.h>
-#include <stdlib.h>
-#include <string.h>
 #include <math.h>
 #include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wctype.h>
 
 #include <espeak-ng/espeak_ng.h>
 #include <espeak/speak_lib.h>

src/libespeak-ng/tr_languages.c

@@ -19,14 +19,12 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <ctype.h>
-#include <wctype.h>
-#include <stdlib.h>
-#include <string.h>
 #include <locale.h>
 #include <stdint.h>
-
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <wctype.h>
 
 #include <espeak-ng/espeak_ng.h>

src/libespeak-ng/translate.c

@@ -19,14 +19,13 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <ctype.h>
+#include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdint.h>
-
-#include <wctype.h>
 #include <wchar.h>
+#include <wctype.h>
 
 #include <espeak-ng/espeak_ng.h>
 #include <espeak/speak_lib.h>

src/libespeak-ng/voices.c

@@ -19,24 +19,23 @@
 
 #include "config.h"
 
-#include "stdio.h"
-#include "ctype.h"
-#include "wctype.h"
-#include "string.h"
-#include "stdlib.h"
+#include <ctype.h>
 #include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wctype.h>
+
+#ifdef PLATFORM_WINDOWS
+#include <windows.h>
+#else
+#include <dirent.h>
+#endif
 
 #include <espeak-ng/espeak_ng.h>
 #include <espeak/speak_lib.h>
 
 #include "speech.h"
-
-#ifdef PLATFORM_WINDOWS
-#include "windows.h"
-#else
-#include "dirent.h"
-#endif
-
 #include "phoneme.h"
 #include "synthesize.h"
 #include "voice.h"

src/libespeak-ng/wave.c

@@ -19,23 +19,23 @@
 
 #include "config.h"
 
-#include <espeak-ng/espeak_ng.h>
-
-#include "speech.h"
-
+#include <assert.h>
+#include <math.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
-#include <math.h>
-#include <assert.h>
+#include <string.h>
 #include <sys/time.h>
 #include <time.h>
+#include <unistd.h>
 
 #ifdef PLATFORM_WINDOWS
 #include <windows.h>
 #endif
-#include <unistd.h>
+
+#include <espeak-ng/espeak_ng.h>
+
+#include "speech.h"
 #include "wave.h"
 
 #ifdef NEED_STRUCT_TIMESPEC

src/libespeak-ng/wave_pulse.c

@@ -26,22 +26,21 @@
 //
 #include "config.h"
 
+#include <assert.h>
+#include <math.h>
+#include <pthread.h>
+#include <pulse/pulseaudio.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/time.h>
+#include <time.h>
+#include <unistd.h>
+
 #include <espeak-ng/espeak_ng.h>
 
 #include "speech.h"
-
-#include <stdbool.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
-#include <assert.h>
-#include <sys/time.h>
-#include <time.h>
-#include <pulse/pulseaudio.h>
-#include <pthread.h>
-#include <unistd.h>
-
 #include "wave.h"
 
 enum {

src/libespeak-ng/wave_sada.c

@@ -21,19 +21,18 @@
 
 #include "config.h"
 
+#include <assert.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stropts.h>
+#include <sys/audioio.h>
+#include <unistd.h>
+
 #include <espeak-ng/espeak_ng.h>
 
 #include "speech.h"
-
-#include <errno.h>
-#include <string.h>
-#include <stropts.h>
-#include <assert.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/audioio.h>
-
 #include "wave.h"
 
 #define SAMPLE_RATE 22050

src/libespeak-ng/wavegen.c

@@ -22,11 +22,11 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
 #include <math.h>
 #include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include <espeak-ng/espeak_ng.h>
 #include <espeak/speak_lib.h>

src/speak-ng.c

@@ -19,15 +19,17 @@
 
 #include "config.h"
 
-#include <espeak-ng/espeak_ng.h>
-
-#include "speech.h"
-
+#include <ctype.h>
+#include <getopt.h>
+#include <locale.h>
+#include <signal.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
+#include <sys/stat.h>
+#include <time.h>
+#include <unistd.h>
 
 #ifndef PLATFORM_DOS
 #ifdef PLATFORM_WINDOWS
@@ -38,16 +40,10 @@
 #endif
 #endif
 
-#include <unistd.h>
-#include <getopt.h>
-#include <time.h>
-#include <signal.h>
-#include <locale.h>
-#include <sys/stat.h>
-
 #include <espeak-ng/espeak_ng.h>
 #include <espeak/speak_lib.h>
 
+#include "speech.h"
 #include "phoneme.h"
 #include "synthesize.h"
 #include "voice.h"