move defines and enums out of cavsdata.h