Move all definitions out of classes
Use = default instead of empty definition