first round of replacing deprecated typedefs with much nicer using statements