can move the decls to first use now

Change-Id: If501dfd0a2bebac45d13110af739e1f22444b823
WaE: -Werror=unused-but-set-variable

Change-Id: I2c1dd24fa2215300255ae4e7d50b6cf990b6e843