Committing fixes to accidentally mangled local repository. What did work should work again, except tests, which aren't picking up the correct include paths.