Re-added class pre-declarations that broke build

Whoops.