2nd refactor: struct sr_blah_blah -> struct BlahBlah; #define SR_BLAH -> BLAH. Notes in refactor_notes