From ee944700f88a034d3d4589d6fbd4bee93ab8afe5 Mon Sep 17 00:00:00 2001
From: Juho Hiltunen <jaacoppi@kapsi.fi>
Date: Thu, 23 Jul 2020 12:18:12 +0300
Subject: [PATCH] code cleanup: Check all local includes with
 include-what-you-use

Going through files in src/libespeak-ng/, include-what-you-use removed a
few unnecessary includes and included explanations on why a certain
header should be included. This makes tracking globals and dependencies easier.

Running the codebase through IWYU should be repeated after each major
code restIncludes to standard c library weren't checked to avoid
breaking builds with other platforms.

See https://github.com/include-what-you-use/include-what-you-use
---
 src/libespeak-ng/compiledata.c   | 22 +++++++++++-----------
 src/libespeak-ng/compiledict.c   | 13 +++++++------
 src/libespeak-ng/compilembrola.c | 10 +++++-----
 src/libespeak-ng/dictionary.c    | 17 ++++++++---------
 src/libespeak-ng/dictionary.h    |  7 ++++---
 src/libespeak-ng/encoding.c      |  9 ++++-----
 src/libespeak-ng/error.c         |  6 +-----
 src/libespeak-ng/espeak_api.c    |  7 ++-----
 src/libespeak-ng/intonation.c    | 10 ++++------
 src/libespeak-ng/klatt.c         |  5 ++---
 src/libespeak-ng/klatt.h         |  4 ++--
 src/libespeak-ng/mnemonics.c     |  2 +-
 src/libespeak-ng/numbers.c       | 15 +++++++--------
 src/libespeak-ng/phonemelist.c   |  6 ++++--
 src/libespeak-ng/readclause.c    | 20 ++++++++++----------
 src/libespeak-ng/spect.c         |  8 ++++----
 src/libespeak-ng/spect.h         |  9 +++------
 src/libespeak-ng/speech.c        | 24 +++++++++++-------------
 src/libespeak-ng/speech.h        |  2 +-
 src/libespeak-ng/ssml.c          | 15 ++++++---------
 src/libespeak-ng/synthdata.c     | 15 +++++++--------
 src/libespeak-ng/synthdata.h     |  8 +++++---
 src/libespeak-ng/synthesize.c    | 19 +++++++++----------
 src/libespeak-ng/synthesize.h    |  3 +--
 src/libespeak-ng/tr_languages.c  |  5 +----
 src/libespeak-ng/translate.c     | 19 +++++++++----------
 src/libespeak-ng/voices.c        | 19 +++++++++----------
 src/libespeak-ng/wavegen.c       |  7 ++-----
 28 files changed, 140 insertions(+), 166 deletions(-)

diff --git a/src/libespeak-ng/compiledata.c b/src/libespeak-ng/compiledata.c
index 6b07ea25..dd6247fa 100644
--- a/src/libespeak-ng/compiledata.c
+++ b/src/libespeak-ng/compiledata.c
@@ -35,17 +35,17 @@
 #include <espeak-ng/speak_lib.h>
 #include <espeak-ng/encoding.h>
 
-#include "readclause.h"
-#include "synthdata.h"
-#include "wavegen.h"
-
-#include "error.h"
-#include "phoneme.h"
-#include "voice.h"
-#include "synthesize.h"
-#include "spect.h"
-#include "translate.h"
-#include "dictionary.h"
+#include "dictionary.h"               // for strncpy0
+#include "error.h"                    // for create_file_error_context
+#include "phoneme.h"                  // for PHONEME_TAB, PHONEME_TAB_LIST
+#include "readclause.h"               // for Read4Bytes
+#include "spect.h"                    // for SpectFrame, peak_t, SpectSeq
+#include "speech.h"  // for path_home, MNEM_TAB, GetFileLength
+#include "synthdata.h"                // for LoadPhData
+#include "synthesize.h"               // for TUNE, frame_t, CONDITION_IS_OTHER
+#include "translate.h"                // for utf8_out, utf8_in
+#include "voice.h"                    // for LoadVoice, voice
+#include "wavegen.h"                  // for WavegenInit, WavegenSetVoice
 
 #define N_ITEM_STRING 256
 
diff --git a/src/libespeak-ng/compiledict.c b/src/libespeak-ng/compiledict.c
index 50e7726b..d0ff4663 100644
--- a/src/libespeak-ng/compiledict.c
+++ b/src/libespeak-ng/compiledict.c
@@ -37,12 +37,13 @@
 #include "dictionary.h"
 #include "readclause.h"
 
-#include "error.h"
-#include "speech.h"
-#include "phoneme.h"
-#include "voice.h"
-#include "synthesize.h"
-#include "translate.h"
+#include "dictionary.h"           // for EncodePhonemes, strncpy0, HashDicti...
+#include "error.h"                // for create_file_error_context
+#include "phoneme.h"              // for PHONEME_TAB_LIST, phonSWITCH, phone...
+#include "readclause.h"           // for towlower2
+#include "speech.h"               // for LookupMnemName, MNEM_TAB, path_home
+#include "synthesize.h"           // for Write4Bytes
+#include "translate.h"            // for isspace2, IsDigit09, utf8_in, utf8_out
 
 static FILE *f_log = NULL;
 
diff --git a/src/libespeak-ng/compilembrola.c b/src/libespeak-ng/compilembrola.c
index c7ce5155..3d63ec70 100644
--- a/src/libespeak-ng/compilembrola.c
+++ b/src/libespeak-ng/compilembrola.c
@@ -30,11 +30,11 @@
 
 #include "mbrola.h"
 
-#include "error.h"
-#include "phoneme.h"
-#include "speech.h"
-#include "voice.h"
-#include "synthesize.h"
+#include "error.h"                // for create_file_error_context
+#include "mbrola.h"               // for MBROLA_TAB
+#include "phoneme.h"              // for N_PHONEME_TAB
+#include "speech.h"               // for path_home
+#include "synthesize.h"           // for Write4Bytes
 
 static const char *basename(const char *filename)
 {
diff --git a/src/libespeak-ng/dictionary.c b/src/libespeak-ng/dictionary.c
index bd144fa8..8a10cedf 100644
--- a/src/libespeak-ng/dictionary.c
+++ b/src/libespeak-ng/dictionary.c
@@ -32,15 +32,14 @@
 #include <espeak-ng/encoding.h>
 
 #include "dictionary.h"
-#include "numbers.h"
-#include "readclause.h"
-#include "synthdata.h"
-
-#include "speech.h"
-#include "phoneme.h"
-#include "voice.h"
-#include "synthesize.h"
-#include "translate.h"
+#include "numbers.h"                       // for LookupAccentedLetter, Look...
+#include "phoneme.h"                       // for PHONEME_TAB, phVOWEL, phon...
+#include "readclause.h"                    // for WordToString2, is_str_tota...
+#include "speech.h"                        // for GetFileLength, path_home
+#include "compiledict.h"                   // for DecodeRule
+#include "synthdata.h"                     // for PhonemeCode, InterpretPhoneme
+#include "synthesize.h"                    // for STRESS_IS_PRIMARY, phoneme...
+#include "translate.h"                     // for Translator, utf8_in, LANGU...
 
 typedef struct {
 	int points;
diff --git a/src/libespeak-ng/dictionary.h b/src/libespeak-ng/dictionary.h
index 2c1650ac..ecdfec07 100644
--- a/src/libespeak-ng/dictionary.h
+++ b/src/libespeak-ng/dictionary.h
@@ -21,9 +21,10 @@
 #ifndef ESPEAK_NG_DICTIONARY_H
 #define ESPEAK_NG_DICTIONARY_H
 
-#include "compiledict.h"
-#include "synthesize.h"
-#include "translate.h"
+#include "espeak-ng/espeak_ng.h"       // for ESPEAK_NG_API
+#include "phoneme.h"                   // for PHONEME_TAB
+#include "synthesize.h"                // for PHONEME_LIST
+#include "translate.h"                 // for Translator, WORD_TAB
 
 #ifdef __cplusplus
 extern "C"
diff --git a/src/libespeak-ng/encoding.c b/src/libespeak-ng/encoding.c
index 02ec0189..1000008f 100644
--- a/src/libespeak-ng/encoding.c
+++ b/src/libespeak-ng/encoding.c
@@ -25,11 +25,10 @@
 #include <espeak-ng/espeak_ng.h>
 #include <espeak-ng/encoding.h>
 
-#include "speech.h"
-#include "phoneme.h"
-#include "voice.h"
-#include "synthesize.h"
-#include "translate.h"
+#include <espeak-ng/encoding.h>   // for espeak_ng_TEXT_DECODER, ESPEAKNG_EN...
+#include "espeak-ng/speak_lib.h"  // for espeakCHARS_16BIT, espeakCHARS_8BIT
+#include "speech.h"               // for LookupMnem, MNEM_TAB
+#include "translate.h"            // for LEADING_2_BITS, UTF8_TAIL_BITS
 
 // http://www.iana.org/assignments/character-sets/character-sets.xhtml
 MNEM_TAB mnem_encoding[] = {
diff --git a/src/libespeak-ng/error.c b/src/libespeak-ng/error.c
index da9b4675..b816c2aa 100644
--- a/src/libespeak-ng/error.c
+++ b/src/libespeak-ng/error.c
@@ -27,11 +27,7 @@
 #include <espeak-ng/espeak_ng.h>
 
 #include "error.h"
-#include "speech.h"
-#include "phoneme.h"
-#include "voice.h"
-#include "synthesize.h"
-#include "dictionary.h"
+#include "dictionary.h"           // for strncpy0
 
 espeak_ng_STATUS
 create_file_error_context(espeak_ng_ERROR_CONTEXT *context,
diff --git a/src/libespeak-ng/espeak_api.c b/src/libespeak-ng/espeak_api.c
index 73d9417b..61eedc2f 100644
--- a/src/libespeak-ng/espeak_api.c
+++ b/src/libespeak-ng/espeak_api.c
@@ -29,11 +29,8 @@
 
 #include "compiledict.h"
 
-#include "phoneme.h"
-#include "voice.h"
-#include "synthesize.h"
-#include "translate.h"
-#include "event.h"
+#include "synthesize.h"           // for espeakINITIALIZE_PHONEME_IPA
+#include "translate.h"            // for dictionary_name, option_phoneme_events
 
 static espeak_ERROR status_to_espeak_error(espeak_ng_STATUS status)
 {
diff --git a/src/libespeak-ng/intonation.c b/src/libespeak-ng/intonation.c
index 1a9e1240..4d1a4965 100644
--- a/src/libespeak-ng/intonation.c
+++ b/src/libespeak-ng/intonation.c
@@ -29,12 +29,10 @@
 #include <espeak-ng/encoding.h>
 
 #include "intonation.h"
-#include "synthdata.h"
-
-#include "phoneme.h"
-#include "voice.h"
-#include "synthesize.h"
-#include "translate.h"
+#include "phoneme.h"     // for PHONEME_TAB, PhonemeCode2, phonPAUSE, phPAUSE
+#include "synthdata.h"   // for PhonemeCode
+#include "synthesize.h"  // for PHONEME_LIST, TUNE, phoneme_list, phoneme_tab
+#include "translate.h"   // for Translator, LANGUAGE_OPTIONS, L, OPTION_EMPH...
 
 /* Note this module is mostly old code that needs to be rewritten to
    provide a more flexible intonation system.
diff --git a/src/libespeak-ng/klatt.c b/src/libespeak-ng/klatt.c
index 8ce8fc0b..a2345e73 100644
--- a/src/libespeak-ng/klatt.c
+++ b/src/libespeak-ng/klatt.c
@@ -34,10 +34,9 @@
 #include <espeak-ng/espeak_ng.h>
 #include <espeak-ng/speak_lib.h>
 
-#include "phoneme.h"
-#include "voice.h"
-#include "synthesize.h"
 #include "klatt.h"
+#include "synthesize.h"  // for frame_t, WGEN_DATA, STEPSIZE, N_KLATTP, echo...
+#include "voice.h"       // for voice_t, N_PEAKS
 
 extern unsigned char *out_ptr;
 extern unsigned char *out_end;
diff --git a/src/libespeak-ng/klatt.h b/src/libespeak-ng/klatt.h
index 4c7a4406..95fb5fcb 100644
--- a/src/libespeak-ng/klatt.h
+++ b/src/libespeak-ng/klatt.h
@@ -24,8 +24,8 @@
 #ifndef ESPEAK_NG_KLATT_H
 #define ESPEAK_NG_KLATT_H
 
-#include "speech.h"
-#include "synthesize.h"
+#include "voice.h"                    // for voice_t
+#include "synthesize.h"              // for frame_t, WGEN_DATA
 
 #ifdef __cplusplus
 extern "C"
diff --git a/src/libespeak-ng/mnemonics.c b/src/libespeak-ng/mnemonics.c
index eee2f576..2cb6e6c7 100644
--- a/src/libespeak-ng/mnemonics.c
+++ b/src/libespeak-ng/mnemonics.c
@@ -23,7 +23,7 @@
 
 #include <espeak-ng/espeak_ng.h>
 
-#include "speech.h"
+#include "speech.h"  // for MNEM_TAB, LookupMnem, LookupMnemName
 
 int LookupMnem(MNEM_TAB *table, const char *string)
 {
diff --git a/src/libespeak-ng/numbers.c b/src/libespeak-ng/numbers.c
index 1e277a2b..05e2d7a3 100644
--- a/src/libespeak-ng/numbers.c
+++ b/src/libespeak-ng/numbers.c
@@ -31,15 +31,14 @@
 #include <espeak-ng/speak_lib.h>
 #include <espeak-ng/encoding.h>
 
-#include "dictionary.h"
 #include "numbers.h"
-#include "readclause.h"
-#include "synthdata.h"
-
-#include "phoneme.h"
-#include "voice.h"
-#include "synthesize.h"
-#include "translate.h"
+#include "dictionary.h"  // for Lookup, TranslateRules, EncodePhonemes, Look...
+#include "phoneme.h"     // for phonSWITCH, PHONEME_TAB, phonEND_WORD, phonP...
+#include "readclause.h"  // for WordToString2, towlower2
+#include "synthdata.h"   // for SelectPhonemeTable
+#include "synthesize.h"  // for phoneme_tab
+#include "translate.h"   // for Translator, LANGUAGE_OPTIONS, IsDigit09, WOR...
+#include "voice.h"       // for voice, voice_t
 
 #define M_LIGATURE  0x8000
 #define M_NAME      0
diff --git a/src/libespeak-ng/phonemelist.c b/src/libespeak-ng/phonemelist.c
index 979d4c05..6fec1dca 100644
--- a/src/libespeak-ng/phonemelist.c
+++ b/src/libespeak-ng/phonemelist.c
@@ -30,10 +30,12 @@
 #include <espeak-ng/encoding.h>
 
 #include "phonemelist.h"
-#include "synthdata.h"
+#include "phoneme.h"     // for PHONEME_TAB, phVOWEL, REPLACE_PHONEMES, phPAUSE
+#include "synthdata.h"   // for InterpretPhoneme, SelectPhonemeTable
+#include "synthesize.h"  // for PHONEME_LIST, PHONEME_LIST2, phoneme_tab
+#include "translate.h"   // for Translator, LANGUAGE_OPTIONS, option_wordgap
 
 #include "phoneme.h"
-#include "voice.h"
 #include "synthesize.h"
 #include "translate.h"
 
diff --git a/src/libespeak-ng/readclause.c b/src/libespeak-ng/readclause.c
index 3307f780..f2ed2b1b 100644
--- a/src/libespeak-ng/readclause.c
+++ b/src/libespeak-ng/readclause.c
@@ -36,17 +36,17 @@
 #include <espeak-ng/encoding.h>
 #include <ucd/ucd.h>
 
-#include "dictionary.h"
 #include "readclause.h"
-#include "synthdata.h"
-
-#include "error.h"
-#include "speech.h"
-#include "phoneme.h"
-#include "voice.h"
-#include "synthesize.h"
-#include "translate.h"
-#include "ssml.h"
+#include "config.h"               // for HAVE_MKSTEMP
+#include "dictionary.h"           // for LookupDictList, DecodePhonemes, Set...
+#include "error.h"                // for create_file_error_context
+#include "phoneme.h"              // for phonSWITCH
+#include "speech.h"               // for GetFileLength, LookupMnem, PATHSEP
+#include "ssml.h"                 // for SSML_STACK, ProcessSsmlTag, N_PARAM...
+#include "synthdata.h"            // for SelectPhonemeTable
+#include "synthesize.h"           // for SOUND_ICON, soundicon_tab, samplerate
+#include "translate.h"            // for Translator, utf8_out, CLAUSE_OPTION...
+#include "voice.h"                // for voice, voice_t, current_voice_selected
 
 #define N_XML_BUF   500
 
diff --git a/src/libespeak-ng/spect.c b/src/libespeak-ng/spect.c
index e2e520d8..4b89c7ef 100644
--- a/src/libespeak-ng/spect.c
+++ b/src/libespeak-ng/spect.c
@@ -30,11 +30,11 @@
 #include <espeak-ng/espeak_ng.h>
 #include <espeak-ng/speak_lib.h>
 
-#include "phoneme.h"
-#include "voice.h"
-#include "synthesize.h"
 #include "spect.h"
-#include "ieee80.h"
+#include "ieee80.h"                    // for ConvertFromIeeeExtended
+#include "wavegen.h"                   // for wavegen_peaks_t, PeaksToHarmspect
+#include "synthesize.h"                // for KLATT_AV, KLATT_Kopen, N_KLATTP2
+#include "voice.h"                     // for N_PEAKS
 
 static int frame_width;
 
diff --git a/src/libespeak-ng/spect.h b/src/libespeak-ng/spect.h
index 64ca61a8..59c2515b 100644
--- a/src/libespeak-ng/spect.h
+++ b/src/libespeak-ng/spect.h
@@ -20,12 +20,9 @@
 #ifndef ESPEAK_NG_SPECT_H
 #define ESPEAK_NG_SPECT_H
 
-#include <espeak-ng/espeak_ng.h>
-
-#include "wavegen.h"
-
-#include "synthesize.h"
-#include "speech.h"
+#include <espeak-ng/espeak_ng.h>     // for espeak_ng_STATUS
+#include "voice.h"                   // for N_PEAKS
+#include "synthesize.h"              // for N_KLATTP2
 
 #ifdef __cplusplus
 extern "C"
diff --git a/src/libespeak-ng/speech.c b/src/libespeak-ng/speech.c
index 331948ca..169e9a9e 100644
--- a/src/libespeak-ng/speech.c
+++ b/src/libespeak-ng/speech.c
@@ -48,20 +48,18 @@
 #include <espeak-ng/speak_lib.h>
 #include <espeak-ng/encoding.h>
 
-#include "dictionary.h"
-#include "mbrola.h"
-#include "readclause.h"
-#include "synthdata.h"
-#include "wavegen.h"
-
 #include "speech.h"
-#include "phoneme.h"
-#include "voice.h"
-#include "synthesize.h"
-#include "translate.h"
-#include "espeak_command.h"
-#include "fifo.h"
-#include "event.h"
+#include "dictionary.h"           // for GetTranslatedPhonemeString, strncpy0
+#include "espeak_command.h"       // for delete_espeak_command, SetParameter
+#include "event.h"                // for event_declare, event_clear_all, eve...
+#include "fifo.h"                 // for fifo_add_command, fifo_add_commands
+#include "mbrola.h"               // for mbrola_delay
+#include "readclause.h"           // for PARAM_STACK, param_stack
+#include "synthdata.h"            // for FreePhData, LoadConfig, LoadPhData
+#include "synthesize.h"           // for SpeakNextClause, Generate, Synthesi...
+#include "translate.h"            // for p_decoder, InitText, translator
+#include "voice.h"                // for FreeVoiceList, VoiceReset, current_...
+#include "wavegen.h"              // for WavegenFill, WavegenInit, WcmdqUsed
 
 unsigned char *outbuf = NULL;
 int outbuf_size = 0;
diff --git a/src/libespeak-ng/speech.h b/src/libespeak-ng/speech.h
index 47d5e6c6..6d2477be 100644
--- a/src/libespeak-ng/speech.h
+++ b/src/libespeak-ng/speech.h
@@ -20,9 +20,9 @@
 #ifndef ESPEAK_NG_SPEECH_H
 #define ESPEAK_NG_SPEECH_H
 
+#include <endian.h>               // for BYTE_ORDER, BIG_ENDIAN
 #include <espeak-ng/espeak_ng.h>
 
-#include "mbrola.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/src/libespeak-ng/ssml.c b/src/libespeak-ng/ssml.c
index b32b7433..9a37aa26 100644
--- a/src/libespeak-ng/ssml.c
+++ b/src/libespeak-ng/ssml.c
@@ -39,16 +39,13 @@
 #include <espeak-ng/encoding.h>
 #include <ucd/ucd.h>
 
-#include "readclause.h"
-
-#include "error.h"
-#include "speech.h"
-#include "phoneme.h"
-#include "voice.h"
-#include "synthesize.h"
-#include "translate.h"
-#include "dictionary.h"
 #include "ssml.h"
+#include "dictionary.h"           // for strncpy0
+#include "readclause.h"           // for PARAM_STACK, param_stack, AddNameData
+#include "speech.h"               // for MNEM_TAB, LookupMnem
+#include "synthesize.h"           // for SPEED_FACTORS, speed
+#include "translate.h"            // for CTRL_EMBEDDED, IsDigit09, utf8_out
+#include "voice.h"                // for SelectVoice, SelectVoiceByName
 
 static MNEM_TAB ssmltags[] = {
 	{ "speak",     SSML_SPEAK },
diff --git a/src/libespeak-ng/synthdata.c b/src/libespeak-ng/synthdata.c
index 8756847d..1cfd73ef 100644
--- a/src/libespeak-ng/synthdata.c
+++ b/src/libespeak-ng/synthdata.c
@@ -31,15 +31,14 @@
 #include <espeak-ng/speak_lib.h>
 #include <espeak-ng/encoding.h>
 
-#include "readclause.h"
 #include "synthdata.h"
-
-#include "error.h"
-#include "speech.h"
-#include "phoneme.h"
-#include "voice.h"
-#include "synthesize.h"
-#include "translate.h"
+#include "error.h"                    // for create_file_error_context, crea...
+#include "phoneme.h"                  // for PHONEME_TAB, PHONEME_TAB_LIST
+#include "speech.h"                   // for path_home, GetFileLength, PATHSEP
+#include "mbrola.h"                   // for mbrola_name
+#include "synthesize.h"               // for PHONEME_LIST, frameref_t, PHONE...
+#include "translate.h"                // for Translator, LANGUAGE_OPTIONS
+#include "voice.h"                    // for ReadTonePoints, tone_points, voice
 
 const int version_phdata  = 0x014801;
 
diff --git a/src/libespeak-ng/synthdata.h b/src/libespeak-ng/synthdata.h
index aac12e51..2f2ab3b7 100644
--- a/src/libespeak-ng/synthdata.h
+++ b/src/libespeak-ng/synthdata.h
@@ -21,14 +21,16 @@
 #ifndef ESPEAK_NG_SYNTHDATA_H
 #define ESPEAK_NG_SYNTHDATA_H
 
-#include "synthesize.h"
-#include "translate.h"
-
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
+#include "espeak-ng/espeak_ng.h"       // for espeak_ng_ERROR_CONTEXT, espea...
+#include "phoneme.h"                   // for PHONEME_TAB
+#include "synthesize.h"                // for PHONEME_DATA, PHONEME_LIST
+#include "translate.h"                 // for Translator
+
 void InterpretPhoneme(Translator *tr,
 		int control,
 		PHONEME_LIST *plist,
diff --git a/src/libespeak-ng/synthesize.c b/src/libespeak-ng/synthesize.c
index ddf78757..9f02a90e 100644
--- a/src/libespeak-ng/synthesize.c
+++ b/src/libespeak-ng/synthesize.c
@@ -32,17 +32,16 @@
 #include <espeak-ng/speak_lib.h>
 #include <espeak-ng/encoding.h>
 
-#include "dictionary.h"
-#include "intonation.h"
-#include "mbrola.h"
-#include "setlengths.h"
-#include "synthdata.h"
-#include "wavegen.h"
-
-#include "phoneme.h"
-#include "voice.h"
 #include "synthesize.h"
-#include "translate.h"
+#include "dictionary.h"           // for WritePhMnemonic, GetTranslatedPhone...
+#include "intonation.h"           // for CalcPitches
+#include "mbrola.h"               // for MbrolaGenerate, mbrola_name
+#include "phoneme.h"              // for PHONEME_TAB, phVOWEL, phLIQUID, phN...
+#include "setlengths.h"           // for CalcLengths
+#include "synthdata.h"            // for InterpretPhoneme, GetEnvelope, Inte...
+#include "translate.h"            // for translator, LANGUAGE_OPTIONS, Trans...
+#include "voice.h"                // for voice_t, voice, LoadVoiceVariant
+#include "wavegen.h"              // for WcmdqInc, WcmdqFree, WcmdqStop
 
 static void SmoothSpect(void);
 
diff --git a/src/libespeak-ng/synthesize.h b/src/libespeak-ng/synthesize.h
index ba4e76d3..ddadc1ea 100644
--- a/src/libespeak-ng/synthesize.h
+++ b/src/libespeak-ng/synthesize.h
@@ -28,8 +28,7 @@ extern "C"
 #include <stdint.h>
 #include <stdbool.h>
 #include <espeak-ng/espeak_ng.h>
-#include "phoneme.h"
-#include "voice.h"
+#include "phoneme.h"              // for PHONEME_TAB, N_PHONEME_TAB
 
 #define espeakINITIALIZE_PHONEME_IPA 0x0002 // move this to speak_lib.h, after eSpeak version 1.46.02
 
diff --git a/src/libespeak-ng/tr_languages.c b/src/libespeak-ng/tr_languages.c
index 0783286e..f2460c61 100644
--- a/src/libespeak-ng/tr_languages.c
+++ b/src/libespeak-ng/tr_languages.c
@@ -30,10 +30,7 @@
 #include <espeak-ng/speak_lib.h>
 #include <espeak-ng/encoding.h>
 
-#include "phoneme.h"
-#include "voice.h"
-#include "synthesize.h"
-#include "translate.h"
+#include "translate.h"           // for Translator, LANGUAGE_OPTIONS, L, NUM...
 
 // start of unicode pages for character sets
 #define OFFSET_GREEK    0x380
diff --git a/src/libespeak-ng/translate.c b/src/libespeak-ng/translate.c
index d99b88b7..bf83db11 100644
--- a/src/libespeak-ng/translate.c
+++ b/src/libespeak-ng/translate.c
@@ -32,17 +32,16 @@
 #include <espeak-ng/speak_lib.h>
 #include <espeak-ng/encoding.h>
 
-#include "dictionary.h"
-#include "numbers.h"
-#include "phonemelist.h"
-#include "readclause.h"
-#include "synthdata.h"
-
-#include "speech.h"
-#include "phoneme.h"
-#include "voice.h"
-#include "synthesize.h"
 #include "translate.h"
+#include "dictionary.h"           // for TranslateRules, LookupDictList, Cha...
+#include "numbers.h"              // for SetSpellingStress, TranslateLetter
+#include "phoneme.h"              // for phonSWITCH, PHONEME_TAB, phonPAUSE_...
+#include "phonemelist.h"          // for MakePhonemeList
+#include "readclause.h"           // for towlower2, Eof, ReadClause, is_str_...
+#include "synthdata.h"            // for SelectPhonemeTable, LookupPhonemeTable
+#include "synthesize.h"           // for PHONEME_LIST2, N_PHONEME_LIST, PHON...
+#include "ucd/ucd.h"              // for ucd_toupper
+#include "voice.h"                // for voice, voice_t
 
 Translator *translator = NULL; // the main translator
 Translator *translator2 = NULL; // secondary translator for certain words
diff --git a/src/libespeak-ng/voices.c b/src/libespeak-ng/voices.c
index beffb800..8f149b63 100644
--- a/src/libespeak-ng/voices.c
+++ b/src/libespeak-ng/voices.c
@@ -38,16 +38,15 @@
 #include <espeak-ng/speak_lib.h>
 #include <espeak-ng/encoding.h>
 
-#include "dictionary.h"
-#include "readclause.h"
-#include "synthdata.h"
-#include "wavegen.h"
-
-#include "speech.h"
-#include "phoneme.h"
-#include "voice.h"
-#include "synthesize.h"
-#include "translate.h"
+#include "voice.h"                    // for voice_t, DoVoiceChange, N_PEAKS
+#include "dictionary.h"               // for strncpy0, LoadDictionary
+#include "phoneme.h"                  // for REPLACE_PHONEMES, n_replace_pho...
+#include "speech.h"                   // for LookupMnem, GetFileLength, PATHSEP
+#include "mbrola.h"                   // for LoadMbrolaTable
+#include "synthdata.h"                // for SelectPhonemeTableName, LookupP...
+#include "synthesize.h"               // for SetSpeed, SPEED_FACTORS, speed
+#include "translate.h"                // for LANGUAGE_OPTIONS, DeleteTranslator
+#include "wavegen.h"                  // for InitBreath
 
 MNEM_TAB genders[] = {
 	{ "male", ENGENDER_MALE },
diff --git a/src/libespeak-ng/wavegen.c b/src/libespeak-ng/wavegen.c
index b161b46f..918d6a89 100644
--- a/src/libespeak-ng/wavegen.c
+++ b/src/libespeak-ng/wavegen.c
@@ -33,11 +33,8 @@
 #include <espeak-ng/speak_lib.h>
 
 #include "wavegen.h"
-
-#include "synthesize.h"
-#include "speech.h"
-#include "phoneme.h"
-#include "voice.h"
+#include "synthesize.h"               // for WGEN_DATA, RESONATOR, frame_t
+#include "mbrola.h"                  // for MbrolaFill, MbrolaReset, mbrola...
 
 #ifdef INCLUDE_KLATT
 #include "klatt.h"