remove unnecessary includes from Geometry/GEMGeometry