- Fixed include and library lookup