4b7bc5ee26
Remove unneeded forward declarations and re-order the code. Signed-off-by: Gagandeep Singh <g.singh@nxp.com>