Reverted to OpenCV compatibility headers. Fixed broken cvmatio setup. Removed some superfluous headers