Moved more enumes and defines to const.h