In addition to the diff from the 1.7 i8kutils release to the 1.13
release, I made the new globals static as per Rusty's namespace
pollution patch yesterday, and removed the reference to an include no
longer in 2.5.