Move the clock_gettime2 and add_time_in_ms definitions to event.h.

src/libespeak-ng/event.c

@@ -36,7 +36,6 @@
 
 #include "speech.h"
 #include "event.h"
-#include "wave.h"
 
 // my_mutex: protects my_thread_is_talking,
 static pthread_mutex_t my_mutex;

src/libespeak-ng/event.h

@@ -61,6 +61,10 @@ espeak_ng_STATUS event_declare(espeak_EVENT *event);
 // Last function to be called.
 void event_terminate();
 
+// general functions
+void clock_gettime2(struct timespec *ts);
+void add_time_in_ms(struct timespec *ts, int time_in_ms);
+
 #ifdef __cplusplus
 }
 #endif

src/libespeak-ng/fifo.c

@@ -37,7 +37,7 @@
 #include "speech.h"
 #include "espeak_command.h"
 #include "fifo.h"
-#include "wave.h"
+#include "event.h"
 
 // my_mutex: protects my_thread_is_talking,
 // my_stop_is_required, and the command fifo

src/libespeak-ng/synthdata.c

@@ -37,7 +37,6 @@
 #include "synthesize.h"
 #include "voice.h"
 #include "translate.h"
-#include "wave.h"
 
 const char *version_string = "1.48.15  16.Apr.15";
 const int version_phdata  = 0x014801;

src/libespeak-ng/wave.h

@@ -31,10 +31,6 @@ extern int wave_close(void *theHandler);
 extern void wave_flush(void *theHandler);
 extern void wave_terminate();
 
-// general functions
-extern void clock_gettime2(struct timespec *ts);
-extern void add_time_in_ms(struct timespec *ts, int time_in_ms);
-
 #ifdef __cplusplus
 }
 #endif