diff: remove stalled entries in headers
(cherry picked from commit 931ad51808a650fd28be27210f25ba05d8e71199)