-Z_RPNQuery *p_query_rpn (ODR o, const char *qbuf);
-Z_AttributesPlusTerm *p_query_scan (ODR o, const char *qbuf);
+Z_RPNQuery *p_query_rpn (ODR o, oid_proto proto, const char *qbuf);
+
+Z_AttributesPlusTerm *p_query_scan (ODR o, oid_proto proto,
+ Odr_oid **attributeSetP, const char *qbuf);