Switch to PlainCpp* and add them to the build.