Remove redundant extern declarations
Merge pull request #356 from arstrube/redundant_extern

(2) Remove redundant extern declarations