as promised, the header changes and some of wingo's virtual fixes as well by accident

Original commit message from CVS:
as promised, the header changes
and some of wingo's virtual fixes as well by accident
8 files changed