Eliminates a pair of #include statements for files that are brought in
automatically by including core.h.
Signed-off-by: NAllan Stephens <allan.stephens@windriver.com>
Signed-off-by: NPaul Gortmaker <paul.gortmaker@windriver.com>