"exec/cpu_ldst.h" doesn't need to huge "cpu.h" header, but simply:
- exec/cpu-defs.h - exec/tlb-common.h - exec/user/abitypes.h - exec/user/guest-base.h Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> --- include/exec/cpu_ldst.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h index c69f02b699..a115553ee8 100644 --- a/include/exec/cpu_ldst.h +++ b/include/exec/cpu_ldst.h @@ -64,11 +64,15 @@ #include "exec/memopidx.h" #include "qemu/int128.h" -#include "cpu.h" +#include "exec/cpu-defs.h" +#include "exec/tlb-common.h" #include "tcg/abi_ptr.h" #if defined(CONFIG_USER_ONLY) +#include "exec/user/abitypes.h" +#include "exec/user/guest-base.h" + #ifndef TARGET_TAGGED_ADDRESSES static inline abi_ptr cpu_untagged_addr(CPUState *cs, abi_ptr x) { -- 2.41.0