whitespace
Merge branch 'streamer45' into oneman
fix up include order in a few places
fix include order in a few more places
patch proto
no more void* in helpers
strtoenum util for patch memb structs