into the extern "C" section.

Add a few more comments and apply some minor edits to make the file contents
fit the original structure again.