Small cleanup of headers, compile errors.
Merge pull request #34 from ptressel/master

Small cleanup of headers, compile errors.