Added missing 'friend' declarations.