Fixed missing semi-colon
Fixed redundant forward declarations