This code should now build the x86_x64-softmmu part 2.

tests/unit/test_gdt_idt_x86.c

@@ -1,9 +1,9 @@
 #include <unicorn/unicorn.h>
-#include <inttypes.h>
+#include "platform.h"
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
-#include <unistd.h>
+#include "platform.h"
 
 /**
  * Assert that err matches expect

tests/unit/test_hang.c

@@ -5,7 +5,7 @@
 
 #include "unicorn_test.h"
 #include <stdio.h>
-#include <inttypes.h>
+#include "platform.h"
 
 uint64_t trunc_page(uint64_t addr)
 {

tests/unit/test_hookcounts.c

@@ -4,7 +4,7 @@
 // emulation by counts of instruction code
 //
 #include "unicorn_test.h"
-#include <inttypes.h>
+#include "platform.h"
 
 #define DEBUG 1
 

tests/unit/test_mem_high.c

@@ -7,7 +7,7 @@
 #include "unicorn_test.h"
 #include <stdio.h>
 #include <string.h>
-#include <inttypes.h>
+#include "platform.h"
 
 /* Called before every test to set up a new instance */
 static int setup(void **state)

tests/unit/test_multihook.c

@@ -1,5 +1,5 @@
 #include "unicorn_test.h"
-#include <inttypes.h>
+#include "platform.h"
 
 #define OK(x)   uc_assert_success(x)
 

tests/unit/test_pc_change.c

@@ -1,6 +1,6 @@
 // Test PC change during the callback. by Nguyen Anh Quynh, 2016
 #include "unicorn_test.h"
-#include <inttypes.h>
+#include "platform.h"
 
 #define OK(x)   uc_assert_success(x)
 

tests/unit/test_tb_x86.c

@@ -8,7 +8,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
-#include <inttypes.h>
+#include "platform.h"
 
 #define RIP_NEXT_TO_THE_SELFMODIFY_OPCODE (1)
 

tests/unit/test_x86.c

@@ -1,5 +1,5 @@
 #include "unicorn_test.h"
-#include <inttypes.h>
+#include "platform.h"
 
 #define OK(x)   uc_assert_success(x)
 

tests/unit/test_x86_rip_bug.c

@@ -1,5 +1,5 @@
-#include <unistd.h>
-#include <inttypes.h>
+#include "platform.h"
+#include "platform.h"
 #include <unicorn/unicorn.h>
 
 #include "unicorn_test.h"

tests/unit/test_x86_shl_enter_leave.c

@@ -1,6 +1,5 @@
-#include <stdint.h>
+#include "platform.h"
 #include <string.h>
-#include <inttypes.h>
 
 #include "unicorn_test.h"
 

tests/unit/test_x86_soft_paging.c

@@ -1,5 +1,5 @@
 #include "unicorn_test.h"
-#include <inttypes.h>
+#include "platform.h"
 
 /*
     Two tests here for software paging