Now that there's a common header with everything unified, drop the defines
from the global namespace.  Pollution sucks.
Signed-off-by: NMike Frysinger <vapier@gentoo.org>