Moved CGGeometry functions to static header