Updated header guarding

Just an example of how to simplify header guarding by moving it from the source files to individual include files.