aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cpu-common.h8
-rw-r--r--hw/hw.h2
-rw-r--r--poison.h (renamed from hw/poison.h)0
3 files changed, 8 insertions, 2 deletions
diff --git a/cpu-common.h b/cpu-common.h
index ce0221b197..b730ca033d 100644
--- a/cpu-common.h
+++ b/cpu-common.h
@@ -7,6 +7,14 @@
#define WORDS_ALIGNED
#endif
+#ifdef TARGET_PHYS_ADDR_BITS
+#include "targphys.h"
+#endif
+
+#ifndef NEED_CPU_H
+#include "poison.h"
+#endif
+
#include "bswap.h"
#include "qemu-queue.h"
diff --git a/hw/hw.h b/hw/hw.h
index 7b500f4e44..328b704fd8 100644
--- a/hw/hw.h
+++ b/hw/hw.h
@@ -5,8 +5,6 @@
#include "qemu-common.h"
#if defined(TARGET_PHYS_ADDR_BITS) && !defined(NEED_CPU_H)
-#include "targphys.h"
-#include "poison.h"
#include "cpu-common.h"
#endif
diff --git a/hw/poison.h b/poison.h
index d7db7f43b6..d7db7f43b6 100644
--- a/hw/poison.h
+++ b/poison.h