Revert "Fix forward declaration"

Authored by broulik on Aug 1 2019, 1:47 PM.

Description

Revert "Fix forward declaration"

Change that wasn't asked for, interrupted me in reviewing a massive patchset.

This reverts commit c271ed146fc1c9aa55a8eafcaea6e7c2c204023b.