Fix up GIN + GiST headers, declarations