Coding standard fixes for includes