Polished some inclusions.

Prepatory commit (going to push to swerve-drive next).