This cleans up quite a lot of #ifdefs, extern variables, and other ugliness.
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>