Revert "d710: remove headers"

This reverts commit 698cc986172d3363ab0826f3de77254dedae99b1.