fixup! S60870 add more headers