Fixed header guards to include file path.
Merge branch 'header_guards_fix' into devel