3.01.08 compatch 2.1.1 - defines and cb_types