Additional fixup to include paths.