Remove Diag include
Old GCC needs class keyword for friend class
Add a couple examples