Added a few missing forward declarations