clean-up forward declarations