Identifiers starting with an underscore and followed immediately by a capital letter are reserved by the C++ standard. The only header guards not fixed are those in the headers auto-generated from java.
This should be whitespace/comment only changes and should produce the same object code.
