some more include path fixes