Clean up some forward decs