remove remaining enum forward declaration