Missed a few files in the last round of commits from Tatsuo, as well
as needed to run autoconf ...