clean up physical merging helpers

Hi Jens,

this series moves various helpers related to merging based on physical
addresses from the public headers into block/, moves the Xen special
case from arch hooks into common code, cleans up the code a bit, and
removes not nessecary includes from the block headers.