Added #include guards for header files (missed 2 files on last commit)