Export the extension point to the rest of the world.

While here, also clean up the header files a bit.