Update includes for ST_Envelope