This is needed by the following patches so that we do not have to add
forward declaratations for any of these. Separating the move and the
actual changes also makes it easier to review the code.

No functional changes.
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>