diff --git a/src/tools/gensyscalls/gensyscalls.cpp b/src/tools/gensyscalls/gensyscalls.cpp
index 482f5daefd..3a726233c7 100644
--- a/src/tools/gensyscalls/gensyscalls.cpp
+++ b/src/tools/gensyscalls/gensyscalls.cpp
@@ -4,12 +4,20 @@
 #include <cstdlib>
 #include <fstream>
 #include <string>
+#include <inttypes.h>
 
-#include "arch_cpu.h"
+#include "arch_config.h"
 
 #include "gensyscalls.h"
 #include "gensyscalls_common.h"
 
+// We can't use SupportDefs.h to maintain portability
+typedef uint8_t uint8;
+typedef uint16_t uint16;
+typedef uint32_t uint32;
+typedef uint64_t uint64;
+
+
 extern "C" gensyscall_syscall_info *gensyscall_get_infos(int *count);
 
 // usage