This required a wide assortment of fixes, including deleting
needless #include <koldfoo.h> headers, some minor additional porting
tasks, and adding in includes that were previously only implicitly
included.