fixed some more extern "C"s