Merge "Remove the dead corkscrew header files too."