Minor warning fixes

Added header guard to files.