Use structs instead of class for friend declaration

@gruenich just out of interest, why is this required (it is not explained but perhaps its obvious...)

Clang warns about it if the definition and the friend declaration are not in sync.

mentioned in commit 17eb3b67

merged

mentioned in commit 109c28c1