From 96c43f3eb2aa279b4617208c22534fc2be586cd5 Mon Sep 17 00:00:00 2001
From: "Reece H. Dunn" <msclrhd@gmail.com>
Date: Sat, 16 Jan 2016 17:54:39 +0000
Subject: [PATCH] Clean up the include files to make them consistent.

---
 src/espeak-ng.c                   |  6 +++---
 src/libespeak-ng/compiledata.c    | 15 +++++++--------
 src/libespeak-ng/compiledict.c    |  6 +++---
 src/libespeak-ng/compilembrola.c  |  2 +-
 src/libespeak-ng/dictionary.c     |  7 +++----
 src/libespeak-ng/error.c          |  6 +++---
 src/libespeak-ng/espeak_api.c     |  7 +++----
 src/libespeak-ng/espeak_command.c | 11 ++++++-----
 src/libespeak-ng/event.c          | 10 +++++-----
 src/libespeak-ng/fifo.c           | 10 +++++-----
 src/libespeak-ng/intonation.c     |  8 ++++----
 src/libespeak-ng/klatt.c          |  4 ++--
 src/libespeak-ng/mbrowrap.c       | 27 +++++++++++++--------------
 src/libespeak-ng/numbers.c        |  9 ++++-----
 src/libespeak-ng/phonemelist.c    |  2 +-
 src/libespeak-ng/readclause.c     | 15 +++++++--------
 src/libespeak-ng/setlengths.c     |  6 +++---
 src/libespeak-ng/spect.c          |  9 ++++-----
 src/libespeak-ng/speech.c         | 28 +++++++++++++---------------
 src/libespeak-ng/synth_mbrola.c   | 10 +++++-----
 src/libespeak-ng/synthdata.c      |  6 +++---
 src/libespeak-ng/synthesize.c     |  8 ++++----
 src/libespeak-ng/tr_languages.c   |  8 +++-----
 src/libespeak-ng/translate.c      |  7 +++----
 src/libespeak-ng/voices.c         | 23 +++++++++++------------
 src/libespeak-ng/wave.c           | 16 ++++++++--------
 src/libespeak-ng/wave_pulse.c     | 25 ++++++++++++-------------
 src/libespeak-ng/wave_sada.c      | 19 +++++++++----------
 src/libespeak-ng/wavegen.c        |  6 +++---
 src/speak-ng.c                    | 20 ++++++++------------
 30 files changed, 159 insertions(+), 177 deletions(-)

diff --git a/src/espeak-ng.c b/src/espeak-ng.c
index 76a1ef51..7d7c81c6 100644
--- a/src/espeak-ng.c
+++ b/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>
diff --git a/src/libespeak-ng/compiledata.c b/src/libespeak-ng/compiledata.c
index e83ba849..46c48a55 100644
--- a/src/libespeak-ng/compiledata.c
+++ b/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;
diff --git a/src/libespeak-ng/compiledict.c b/src/libespeak-ng/compiledict.c
index 4374e398..e9540e19 100644
--- a/src/libespeak-ng/compiledict.c
+++ b/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>
diff --git a/src/libespeak-ng/compilembrola.c b/src/libespeak-ng/compilembrola.c
index 0ced134c..1bf813da 100644
--- a/src/libespeak-ng/compilembrola.c
+++ b/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>
diff --git a/src/libespeak-ng/dictionary.c b/src/libespeak-ng/dictionary.c
index d622de22..99dd9ce2 100644
--- a/src/libespeak-ng/dictionary.c
+++ b/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>
diff --git a/src/libespeak-ng/error.c b/src/libespeak-ng/error.c
index 1e8eb9ef..a093def7 100644
--- a/src/libespeak-ng/error.c
+++ b/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>
 
diff --git a/src/libespeak-ng/espeak_api.c b/src/libespeak-ng/espeak_api.c
index b81fe25d..f4315859 100644
--- a/src/libespeak-ng/espeak_api.c
+++ b/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)
diff --git a/src/libespeak-ng/espeak_command.c b/src/libespeak-ng/espeak_command.c
index 67355a95..dfb8ba62 100644
--- a/src/libespeak-ng/espeak_command.c
+++ b/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;
 
diff --git a/src/libespeak-ng/event.c b/src/libespeak-ng/event.c
index 0833bcce..3dc7b7e7 100644
--- a/src/libespeak-ng/event.c
+++ b/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>
diff --git a/src/libespeak-ng/fifo.c b/src/libespeak-ng/fifo.c
index e5385a59..023ea890 100644
--- a/src/libespeak-ng/fifo.c
+++ b/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>
 
diff --git a/src/libespeak-ng/intonation.c b/src/libespeak-ng/intonation.c
index 438a851b..0e908f30 100644
--- a/src/libespeak-ng/intonation.c
+++ b/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>
diff --git a/src/libespeak-ng/klatt.c b/src/libespeak-ng/klatt.c
index 2d305cdc..2d7d32dc 100644
--- a/src/libespeak-ng/klatt.c
+++ b/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>
diff --git a/src/libespeak-ng/mbrowrap.c b/src/libespeak-ng/mbrowrap.c
index 822ffd58..9ac6a5b1 100644
--- a/src/libespeak-ng/mbrowrap.c
+++ b/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
diff --git a/src/libespeak-ng/numbers.c b/src/libespeak-ng/numbers.c
index b272a834..ada7891c 100644
--- a/src/libespeak-ng/numbers.c
+++ b/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>
diff --git a/src/libespeak-ng/phonemelist.c b/src/libespeak-ng/phonemelist.c
index e7f42d60..55907c8f 100644
--- a/src/libespeak-ng/phonemelist.c
+++ b/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>
diff --git a/src/libespeak-ng/readclause.c b/src/libespeak-ng/readclause.c
index 14420987..d1c80564 100644
--- a/src/libespeak-ng/readclause.c
+++ b/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>
diff --git a/src/libespeak-ng/setlengths.c b/src/libespeak-ng/setlengths.c
index 094e9396..e09c1d2e 100644
--- a/src/libespeak-ng/setlengths.c
+++ b/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>
diff --git a/src/libespeak-ng/spect.c b/src/libespeak-ng/spect.c
index 9aeed7ce..4669e450 100644
--- a/src/libespeak-ng/spect.c
+++ b/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);
 
diff --git a/src/libespeak-ng/speech.c b/src/libespeak-ng/speech.c
index 60739dba..3c7d964f 100644
--- a/src/libespeak-ng/speech.c
+++ b/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"
diff --git a/src/libespeak-ng/synth_mbrola.c b/src/libespeak-ng/synth_mbrola.c
index 9aaad7bc..e761314e 100644
--- a/src/libespeak-ng/synth_mbrola.c
+++ b/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>
diff --git a/src/libespeak-ng/synthdata.c b/src/libespeak-ng/synthdata.c
index 13516d50..12dffff7 100644
--- a/src/libespeak-ng/synthdata.c
+++ b/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>
diff --git a/src/libespeak-ng/synthesize.c b/src/libespeak-ng/synthesize.c
index 810aaf62..e2bf519b 100644
--- a/src/libespeak-ng/synthesize.c
+++ b/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>
diff --git a/src/libespeak-ng/tr_languages.c b/src/libespeak-ng/tr_languages.c
index b702a7c7..5b73a4e8 100644
--- a/src/libespeak-ng/tr_languages.c
+++ b/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>
diff --git a/src/libespeak-ng/translate.c b/src/libespeak-ng/translate.c
index 9f37bc61..0094815f 100644
--- a/src/libespeak-ng/translate.c
+++ b/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>
diff --git a/src/libespeak-ng/voices.c b/src/libespeak-ng/voices.c
index 58efdab0..0d384bb9 100644
--- a/src/libespeak-ng/voices.c
+++ b/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"
diff --git a/src/libespeak-ng/wave.c b/src/libespeak-ng/wave.c
index 9c66d3f0..46bc45ee 100644
--- a/src/libespeak-ng/wave.c
+++ b/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
diff --git a/src/libespeak-ng/wave_pulse.c b/src/libespeak-ng/wave_pulse.c
index 340c6de8..ba947b8b 100644
--- a/src/libespeak-ng/wave_pulse.c
+++ b/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 {
diff --git a/src/libespeak-ng/wave_sada.c b/src/libespeak-ng/wave_sada.c
index 4a25167c..ebfbe3ce 100644
--- a/src/libespeak-ng/wave_sada.c
+++ b/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
diff --git a/src/libespeak-ng/wavegen.c b/src/libespeak-ng/wavegen.c
index 9d8706fb..c3b9d469 100644
--- a/src/libespeak-ng/wavegen.c
+++ b/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>
diff --git a/src/speak-ng.c b/src/speak-ng.c
index 73cdb664..f52d334d 100644
--- a/src/speak-ng.c
+++ b/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"