Added new link/include paths