Aubrey Huff has been working out with the Giants since he left his rehab assignment on July 19 with tendinitis in his sprained right knee, and manager Bruce Bochy said the veteran first baseman is close to returning to the team.