This does some more tidying and converging of the header split, following
the x86 example.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>