These different headers are not needed.
Signed-off-by: NDaniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: NLen Brown <len.brown@intel.com>