which included commits to RCS files with non-trunk default branches.

the version number is obtained from.

 #include_next <string.h> wasfailing since the /usr/include directory is
first on FreeBSD, and since it was already past it, it failed some of
the tests.

a small amount of unused stuff (by the bmakefiles to follow), but it
isn't much and seems harmless enough.