Corrected placement of typedefs used by macros, and brought them to use in all macros
Merge pull request #815 from andersgb1/point_types_fix

Avoid the use of undefined typedefs