From Benedikt: AddFriendToClass(); and me: cleanup fwd decls.