Cleaning up navigation includes.

Needs more work.