Partially revert a patch.

The right headers are now in the place.

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>