Cleanup linking with YaHTTP

Replace the hardcoded paths with variables.
Merge pull request #1807 from rubenk/cleanup-linking-with-yahttp

Cleanup linking with YaHTTP