Adding geometry function.
Fixed includes.