Minor warning fixes

Added header guard to files.
Merge pull request #1 from Ulto/Fixes1

Minor warning fixes