Revert "Change include and linked PATH"

This reverts commit 68ae49e49a055f7a613f38cfcf2aecf29c3900ea.
Revert "Revert "Change include and linked PATH""

This reverts commit 62b2b5fab4bef38c3f97536d3489c4b0e5092930.
Commit