Continuing the conversion, header by header file.