proper newlining of definitions

newlines inhibited with includes/typedefs/constants only