diff --git a/src/libespeak-ng/espeak_command.h b/src/libespeak-ng/espeak_command.h
index db7baec5..8d1d4d23 100644
--- a/src/libespeak-ng/espeak_command.h
+++ b/src/libespeak-ng/espeak_command.h
@@ -19,8 +19,6 @@
 #ifndef ESPEAK_COMMAND_H
 #define ESPEAK_COMMAND_H
 
-#include <unistd.h>
-
 #ifdef __cplusplus
 extern "C"
 {
diff --git a/src/libespeak-ng/event.c b/src/libespeak-ng/event.c
index 3dc7b7e7..9c72b8a9 100644
--- a/src/libespeak-ng/event.c
+++ b/src/libespeak-ng/event.c
@@ -25,6 +25,7 @@
 #include <pthread.h>
 #include <semaphore.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/time.h>
diff --git a/src/libespeak-ng/fifo.c b/src/libespeak-ng/fifo.c
index 023ea890..61de382d 100644
--- a/src/libespeak-ng/fifo.c
+++ b/src/libespeak-ng/fifo.c
@@ -24,6 +24,7 @@
 #include <errno.h>
 #include <pthread.h>
 #include <semaphore.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/time.h>
@@ -34,6 +35,7 @@
 #include <espeak-ng/espeak_ng.h>
 
 #include "speech.h"
+#include "espeak_command.h"
 #include "fifo.h"
 #include "wave.h"
 
diff --git a/src/libespeak-ng/fifo.h b/src/libespeak-ng/fifo.h
index a1e5937c..2b491441 100644
--- a/src/libespeak-ng/fifo.h
+++ b/src/libespeak-ng/fifo.h
@@ -22,8 +22,6 @@
 // Helps to add espeak commands in a first-in first-out queue
 // and run them asynchronously.
 
-#include "espeak_command.h"
-
 #ifdef __cplusplus
 extern "C"
 {
diff --git a/src/libespeak-ng/speech.c b/src/libespeak-ng/speech.c
index 3c7d964f..c7318f62 100644
--- a/src/libespeak-ng/speech.c
+++ b/src/libespeak-ng/speech.c
@@ -23,6 +23,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <locale.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -46,6 +47,7 @@
 #include "synthesize.h"
 #include "voice.h"
 #include "translate.h"
+#include "espeak_command.h"
 #include "fifo.h"
 #include "event.h"
 #include "wave.h"
diff --git a/src/libespeak-ng/speech.h b/src/libespeak-ng/speech.h
index 40f2e40d..872cc14f 100644
--- a/src/libespeak-ng/speech.h
+++ b/src/libespeak-ng/speech.h
@@ -20,8 +20,6 @@
 #ifndef SPEECH_H
 #define SPEECH_H
 
-#include <sys/types.h>
-
 #ifdef __cplusplus
 extern "C"
 {
diff --git a/src/libespeak-ng/wave.c b/src/libespeak-ng/wave.c
index 46bc45ee..4329ad8a 100644
--- a/src/libespeak-ng/wave.c
+++ b/src/libespeak-ng/wave.c
@@ -22,6 +22,7 @@
 #include <assert.h>
 #include <math.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/libespeak-ng/wave.h b/src/libespeak-ng/wave.h
index 59d109b1..1b6f1ef8 100644
--- a/src/libespeak-ng/wave.h
+++ b/src/libespeak-ng/wave.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007, Gilles Casse <gcasse@oralux.org>
- * Copyright (C) 2015 Reece H. Dunn
+ * Copyright (C) 2015-2016 Reece H. Dunn
  * based on AudioIO.cc (Audacity-1.2.4b) and wavegen.cpp
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,10 +20,6 @@
 #ifndef WAVE_H
 #define WAVE_H
 
-#ifndef PLATFORM_DOS
-#include "stdint.h"
-#endif
-
 #ifdef __cplusplus
 extern "C"
 {