Starting toward removing orphans and going with forward declarations