Cosmetic changes: shouldn't use double underscore in my header files.