Fixed incorrect header guard/nested header mechanism.