Move the klatt methods from synthesize.h to klatt.h.

src/libespeak-ng/klatt.c

@@ -35,10 +35,10 @@
 #include <espeak-ng/speak_lib.h>
 
 #include "speech.h"
-#include "klatt.h"
 #include "phoneme.h"
 #include "voice.h"
 #include "synthesize.h"
+#include "klatt.h"
 
 extern unsigned char *out_ptr;
 extern unsigned char *out_start;

src/libespeak-ng/klatt.h

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2008 by Jonathan Duddington
  * email: jonsd@users.sourceforge.net
- * Copyright (C) 2015 Reece H. Dunn
+ * Copyright (C) 2015-2017 Reece H. Dunn
  *
  * Based on a re-implementation by:
  * (c) 1993,94 Jon Iles and Nick Ing-Simmons
@@ -171,6 +171,10 @@ typedef struct {
 	DOUBLEX bp_inc;
 }  klatt_peaks_t;
 
+void KlattInit(void);
+void KlattReset(int control);
+int Wavegen_Klatt2(int length, int resume, frame_t *fr1, frame_t *fr2);
+
 
 #ifdef __cplusplus
 }

src/libespeak-ng/synthesize.h

@@ -553,10 +553,6 @@ int NumInstnWords(USHORT *prog);
 
 void InitBreath(void);
 
-void KlattInit(void);
-void KlattReset(int control);
-int Wavegen_Klatt2(int length, int resume, frame_t *fr1, frame_t *fr2);
-
 #ifdef __cplusplus
 }
 #endif

src/libespeak-ng/wavegen.c

@@ -36,6 +36,10 @@
 #include "voice.h"
 #include "synthesize.h"
 
+#ifdef INCLUDE_KLATT
+#include "klatt.h"
+#endif
+
 #if HAVE_SONIC_H
 #include "sonic.h"
 #endif