Move more #includes outside of extern "C" {}. (dm)