x86, VisWS: turn into generic arch, update include file change