CS fixes
minor #436 CS fixes (keradus)

This PR was squashed before being merged into the 0.5.x-dev branch (closes #436).

Discussion
----------

CS fixes

Commits
-------

b01fb18 CS fixes
IncludeFixerTest - add testcase for #439