minor clean up with include_guard()
3 files changed