include guards
Reorder includes
unicode
Merge pull request #112 from eggrobin/minor-cleanup

Minor cleanup