Cleanup

General cleanup mostly related to replacing includes with forward-declarations