Drop extraneous duplicate header includes

Signed-off-by: Bryce Harrington <b.harrington@samsung.com>
4 files changed