Updated typdefs

Added ifndef
Added Scalar and uShort typedefs