Includes: Replace includes with "sub-includes" if possible.
Includes: Remove unnecessary includes.
Merge pull request #3880 from ace20022/includes_1

Cleanup some includes