x86, um: now we can get rid of trivial uml headers