Use appropriate include guard
Handle most of mcmanus@'s feedback