-void *XCBWaitForReply(XCBConnection *c, unsigned int request, XCBGenericError **e);
-
-
-/* xcb_xid.c */
-
-CARD32 XCBGenerateID(XCBConnection *c);
+void *xcb_wait_for_reply(xcb_connection_t *c, unsigned int request, xcb_generic_error_t **e);
+int xcb_poll_for_reply(xcb_connection_t *c, unsigned int request, void **reply, xcb_generic_error_t **error);