Tweak usage: explicit .. in include and cleaner make usage
Add some things that should have been en-repo'd a while ago