Modify variable names to be C++ compatible.

Commenting out the names in the header files is ugly, so simply rename them
to be more specific than "class" or "private", e.g. "io_private".
Move the drr_versioninfo layout info alongside.