From 87c8cfce6bcf0c8a50950dfaead424def4fb36f9 Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xerthesquirrel@gmail.com>
Date: Fri, 6 Nov 2020 21:03:28 -0500
Subject: [PATCH] Correct includes in translators.

---
 src/armv5te/translate_aarch64.cpp | 14 +++++++-------
 src/armv5te/translate_arm.cpp     | 16 ++++++++--------
 src/armv5te/translate_x86.c       | 15 ++++++++-------
 src/armv5te/translate_x86_64.c    | 15 ++++++++-------
 4 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/src/armv5te/translate_aarch64.cpp b/src/armv5te/translate_aarch64.cpp
index 056c54f..9754a73 100644
--- a/src/armv5te/translate_aarch64.cpp
+++ b/src/armv5te/translate_aarch64.cpp
@@ -21,13 +21,13 @@
 #include <assert.h>
 #include <stdint.h>
 
-#include "asmcode.h"
-#include "cpudefs.h"
-#include "emu.h"
-#include "translate.h"
-#include "mem.h"
-#include "mmu.h"
-#include "os/os.h"
+#include "armv5te/asmcode.h"
+#include "armv5te/cpudefs.h"
+#include "armv5te/emu.h"
+#include "armv5te/translate.h"
+#include "armv5te/mem.h"
+#include "armv5te/mmu.h"
+#include "armv5te/os/os.h"
 
 #ifdef IS_IOS_BUILD
 #include <sys/mman.h>
diff --git a/src/armv5te/translate_arm.cpp b/src/armv5te/translate_arm.cpp
index 7239fd9..f4f368b 100644
--- a/src/armv5te/translate_arm.cpp
+++ b/src/armv5te/translate_arm.cpp
@@ -20,14 +20,14 @@
 // it doesn't work that often as the mmaped section is too far away.
 // #define REL_BRANCH
 
-#include "asmcode.h"
-#include "cpu.h"
-#include "cpudefs.h"
-//#include "disasm.h"
-#include "mem.h"
-#include "mmu.h"
-#include "translate.h"
-#include "os/os.h"
+#include "armv5te/asmcode.h"
+#include "armv5te/cpu.h"
+#include "armv5te/cpudefs.h"
+//#include "armv5te/disasm.h"
+#include "armv5te/mem.h"
+#include "armv5te/mmu.h"
+#include "armv5te/translate.h"
+#include "armv5te/os/os.h"
 
 #ifdef __thumb__
 #error Thumb mode is not supported!
diff --git a/src/armv5te/translate_x86.c b/src/armv5te/translate_x86.c
index a242fc6..58cb260 100644
--- a/src/armv5te/translate_x86.c
+++ b/src/armv5te/translate_x86.c
@@ -1,13 +1,14 @@
 #include <stdbool.h>
 #include <stdio.h>
+#include <stdint.h>
 
-#include "os/os.h"
-#include "emu.h"
-#include "mem.h"
-#include "cpu.h"
-#include "asmcode.h"
-#include "translate.h"
-#include "debug.h"
+#include "armv5te/os/os.h"
+#include "armv5te/emu.h"
+#include "armv5te/mem.h"
+#include "armv5te/cpu.h"
+#include "armv5te/asmcode.h"
+#include "armv5te/translate.h"
+#include "armv5te/debug.h"
 
 extern void translation_enter() __asm__("translation_enter");
 extern void translation_next() __asm__("translation_next");
diff --git a/src/armv5te/translate_x86_64.c b/src/armv5te/translate_x86_64.c
index 4f85e3e..a4ff3aa 100644
--- a/src/armv5te/translate_x86_64.c
+++ b/src/armv5te/translate_x86_64.c
@@ -1,12 +1,13 @@
 #include <assert.h>
+#include <stdint.h>
 
-#include "emu.h"
-#include "mem.h"
-#include "cpu.h"
-#include "asmcode.h"
-#include "translate.h"
-#include "debug.h"
-#include "os/os.h"
+#include "armv5te/emu.h"
+#include "armv5te/mem.h"
+#include "armv5te/cpu.h"
+#include "armv5te/asmcode.h"
+#include "armv5te/translate.h"
+#include "armv5te/debug.h"
+#include "armv5te/os/os.h"
 
 extern void translation_enter() __asm__("translation_enter");
 extern void translation_next() __asm__("translation_next");