More refactoring of how we register and find declarations.
Still messing around with housing declarations. On the plus side, got includes working and added test for includes.