Signed-off-by: Richard Henderson <richard.hender...@linaro.org>
---
include/disas/disas.h | 6 ------
disas/disas.c | 3 ++-
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/include/disas/disas.h b/include/disas/disas.h
index 6c394e0b09..176775eff7 100644
--- a/include/disas/disas.h
+++ b/include/disas/disas.h
@@ -1,11 +1,6 @@
#ifndef QEMU_DISAS_H
#define QEMU_DISAS_H
-#include "exec/hwaddr.h"
-
-#ifdef NEED_CPU_H
-#include "cpu.h"
-
/* Disassemble this for me please... (debugging). */
void disas(FILE *out, const void *code, size_t size);
void target_disas(FILE *out, CPUState *cpu, uint64_t code, size_t size);
@@ -17,7 +12,6 @@ char *plugin_disas(CPUState *cpu, uint64_t addr, size_t size);
/* Look up symbol for debugging purpose. Returns "" if unknown. */
const char *lookup_symbol(uint64_t orig_addr);
-#endif
struct syminfo;
struct elf32_sym;
diff --git a/disas/disas.c b/disas/disas.c
index f5e95043cf..a709831e8d 100644
--- a/disas/disas.c
+++ b/disas/disas.c
@@ -3,9 +3,10 @@
#include "disas/dis-asm.h"
#include "elf.h"
#include "qemu/qemu-print.h"
-
#include "disas/disas.h"
#include "disas/capstone.h"
+#include "hw/core/cpu.h"
+#include "exec/memory.h"
typedef struct CPUDebug {
struct disassemble_info info;
--
2.34.1
