Moved some decls from v7.h to v7.c