Add extern "C" to C .h files to please C++ compiler. Some tiny thor updates.