Updated solution for portability

Untying some knots here and there with include/linker directories