Integrate files from Scott Goehringer into build process.