Made forward declarations of struct vs class consistent against main declaration