Reintroduce headers that were mistakenly removed in commit 2d39f07637a.