Revert "include: Tag directly the last headers"
This reverts commit 839fc8cdf9b6bafe120e7da8a4b78950ad7295c4.