diff --git a/qemu/cpu-exec-common.c b/qemu/cpu-exec-common.c
index 0ec841ed..9d3268a0 100644
--- a/qemu/cpu-exec-common.c
+++ b/qemu/cpu-exec-common.c
@@ -17,6 +17,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "sysemu/cpus.h"
 #include "exec/memory-internal.h"
diff --git a/qemu/cpu-exec.c b/qemu/cpu-exec.c
index 9511b92f..cf0a9fa1 100644
--- a/qemu/cpu-exec.c
+++ b/qemu/cpu-exec.c
@@ -19,6 +19,7 @@
 
 /* Modified for Unicorn Engine by Nguyen Anh Quynh, 2015 */
 
+#include "qemu/osdep.h"
 #include "tcg.h"
 #include "sysemu/sysemu.h"
 #include "exec/address-spaces.h"
diff --git a/qemu/cpus.c b/qemu/cpus.c
index 05978eaf..c39a7578 100644
--- a/qemu/cpus.c
+++ b/qemu/cpus.c
@@ -25,7 +25,7 @@
 /* Modified for Unicorn Engine by Nguyen Anh Quynh, 2015 */
 
 /* Needed early for CONFIG_BSD etc. */
-#include "config-host.h"
+#include "qemu/osdep.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/cpus.h"
 #include "qemu/thread.h"
diff --git a/qemu/cputlb.c b/qemu/cputlb.c
index 424417da..222792fc 100644
--- a/qemu/cputlb.c
+++ b/qemu/cputlb.c
@@ -19,7 +19,7 @@
 
 /* Modified for Unicorn Engine by Nguyen Anh Quynh, 2015 */
 
-#include "config.h"
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/exec-all.h"
 #include "exec/memory.h"
diff --git a/qemu/exec.c b/qemu/exec.c
index 715e502d..d1e5becd 100644
--- a/qemu/exec.c
+++ b/qemu/exec.c
@@ -18,9 +18,8 @@
  */
 /* Modified for Unicorn Engine by Nguyen Anh Quynh, 2015 */
 
-#include "config.h"
+#include "qemu/osdep.h"
 #ifndef _WIN32
-#include <sys/types.h>
 #include <sys/mman.h>
 #endif
 
@@ -29,7 +28,6 @@
 #include "tcg.h"
 #include "hw/hw.h"
 #include "hw/qdev.h"
-#include "qemu/osdep.h"
 #include "sysemu/sysemu.h"
 #include "qemu/timer.h"
 #include "exec/memory.h"
diff --git a/qemu/translate-all.c b/qemu/translate-all.c
index b8167fe1..e672dbaf 100644
--- a/qemu/translate-all.c
+++ b/qemu/translate-all.c
@@ -22,17 +22,11 @@
 #include <winsock2.h>
 #include <windows.h>
 #else
-#include <sys/types.h>
 #include <sys/mman.h>
 #endif
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include "qemu/osdep.h"
 #include "unicorn/platform.h"
 
-#include "config.h"
-
 #include "qemu-common.h"
 #define NO_CPU_IO_DEFS
 #include "cpu.h"
diff --git a/qemu/translate-common.c b/qemu/translate-common.c
index 98e1bf83..a9c0e4c1 100644
--- a/qemu/translate-common.c
+++ b/qemu/translate-common.c
@@ -17,6 +17,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qom/cpu.h"