Include cleanup in package related headers

Inclusion of redundant headers can result in a lack of inclusion of required
headers in other files.