conceptual ok guenther millert nicm

of the code as a large number of similar clauses makes it impossible
to write an ad for a product using the code...

entire trees for testing anyway, I might as well do this intrusive touching
of include files now.  Added openBSD tags.