There's no point is splitting those anymore.

We're now also able to drop another forward
declaration.
Tested-by: NBin Liu <b-liu@ti.com>
Signed-off-by: NFelipe Balbi <balbi@ti.com>