Fix invalid fwd declarations