Update spec to reflect moving types definitions to header file.