Added more opencv header includes