Avoid including unnecessary headers all the time as well as circular
includes with core requirements.
Signed-off-by: NMike Frysinger <vapier@gentoo.org>