Also remove unnecessary includes from the x86 version, and fix up transitive includes from other x86 files. Change-Id: I9f7d330f287c9ed52eed1544c47251b4354cfab3 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/49166 Reviewed-by: Bobby Bruce <bbruce@ucdavis.edu> Maintainer: Gabe Black <gabe.black@gmail.com> Tested-by: kokoro <noreply+kokoro@google.com>