further fix to paths for included files