Fix linking and includes