The missing definitions are now in.

This reverts commit 23886839.
Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>