Moved includes to cva.h