Removed forward declarations: caused build errors & redundant.