remove friend class, it was struct
Merge remote-tracking branch 'origin/class-struct' into bsd10