nicki: update headers
Revert "nicki: update headers"

This reverts commit 72fc335e33f9b3d25be4af3eb20a77ed372ebc0c.
nicki: update video headers