Make highgui.hpp independent from C API
Make photo.hpp independent from C API
Make flann headers independent from OpenCV C API