This fixes an old issue: the headers were moved out out of assembly a while back while cpp files had been forgotten.