update from Mike Hibler for new VM and other machine support
use proper include files
merge in hp300 support from Utah
12