Move more CC_HINTs to headers