Added missing include and some useful typedefs. Resolved ambiguous template instantiations.
Added missing include and some useful typedefs. Resolved ambiguous template
instantiations.

ruschelp/cortex-vfx,ruschelp/cortex-vfx,code-google-com/cortex-vfx,ruschelp/cortex-vfx,code-google-com/cortex-vfx,code-google-com/cortex-vfx,code-google-com/cortex-vfx