Follow OpenCV header changes