Bug 1018995 - Make some forward class declarations match their definitions r=jandem