Merge "init: remove superfluous forward definitions"