And fixed some include paths so that it all works.