Move constants to the correct header

Change-Id: Id4bd14f72487bd7156cd2e1930eaf97b47896273
3 files changed