From 90d53e145fd1bb4bb557d2a9251d4246f851c76b Mon Sep 17 00:00:00 2001
From: "Reece H. Dunn" <msclrhd@gmail.com>
Date: Wed, 25 Oct 2017 07:12:45 +0100
Subject: [PATCH] Move the klatt methods from synthesize.h to klatt.h.

---
 src/libespeak-ng/klatt.c      | 2 +-
 src/libespeak-ng/klatt.h      | 6 +++++-
 src/libespeak-ng/synthesize.h | 4 ----
 src/libespeak-ng/wavegen.c    | 4 ++++
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/libespeak-ng/klatt.c b/src/libespeak-ng/klatt.c
index 6cd9bf21..8b754307 100644
--- a/src/libespeak-ng/klatt.c
+++ b/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;
diff --git a/src/libespeak-ng/klatt.h b/src/libespeak-ng/klatt.h
index 0dbb996e..23934ad5 100644
--- a/src/libespeak-ng/klatt.h
+++ b/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
 }
diff --git a/src/libespeak-ng/synthesize.h b/src/libespeak-ng/synthesize.h
index f3975271..63346b70 100644
--- a/src/libespeak-ng/synthesize.h
+++ b/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
diff --git a/src/libespeak-ng/wavegen.c b/src/libespeak-ng/wavegen.c
index 178fc6a1..a083c534 100644
--- a/src/libespeak-ng/wavegen.c
+++ b/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