Add missing headers
Update and merge pull request #1 from dburr/master