Revert "include ogr_geometry.h for OGRwkbVariant"

This reverts commit 456f9a129dbe7970cf2ced30390fe6196c9f7344.
Debugging.