updated include guards and changes preprend convention

Updates for style guide compliance.