Fix a few #include guard inconsistencies.