Fix src-path and inc-path computation (final with new algo)