am 7112e4c7: Merge "Remove the dead corkscrew header files too."

* commit '7112e4c7cb9168ddaee418c4ed4b0c54b475f99e':
  Remove the dead corkscrew header files too.