UAPI headers including non-UAPI headers by accident?

include/uapi/linux/signal.h starts with:

#ifndef _UAPI_LINUX_SIGNAL_H
#define _UAPI_LINUX_SIGNAL_H

#include <asm/signal.h>
#include <asm/siginfo.h>

This causes it to include <asm/signal.h>, which is not the same thing
as <uapi/asm/signal.h>.  Changing that will break userspace use of
this header, though, as the uapi/ won't get removed.

What's the correct fix?  This is causing trouble with a UML build for me.

Thanks,
Andy