Fix some code consistency issues.

- Function typedef names
- Include guards
- Style
Merge pull request #7 from seanfisk/code-consistency

Fix some code consistency issues.