Clean up forward decs and includes