<machine/asm.h>.
The former file was too hard to get at from other parts of the src tree and will go away.