Now that the common header is sane, we can drop the transitional cruft.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>