Index: include/arch/unix/apr_arch_poll_private.h
===================================================================
--- include/arch/unix/apr_arch_poll_private.h	(revision 901825)
+++ include/arch/unix/apr_arch_poll_private.h	(working copy)
@@ -168,8 +168,8 @@
 };
 
 /* Private functions */
-apr_status_t create_wakeup_pipe(apr_pool_t *pool, apr_pollfd_t *pfd, apr_file_t **wakeup_pipe);
-apr_status_t close_wakeup_pipe(apr_file_t **wakeup_pipe);
-void drain_wakeup_pipe(apr_file_t **wakeup_pipe);
+apr_status_t apr_pollset_create_wakeup_pipe(apr_pool_t *pool, apr_pollfd_t *pfd, apr_file_t **wakeup_pipe);
+apr_status_t apr_pollset_close_wakeup_pipe(apr_file_t **wakeup_pipe);
+void apr_pollset_drain_wakeup_pipe(apr_file_t **wakeup_pipe);
 
 #endif /* APR_ARCH_POLL_PRIVATE_H */
Index: poll/unix/kqueue.c
===================================================================
--- poll/unix/kqueue.c	(revision 901825)
+++ poll/unix/kqueue.c	(working copy)
@@ -277,7 +277,7 @@
             if ((pollset->flags & APR_POLLSET_WAKEABLE) &&
                 fd.desc_type == APR_POLL_FILE &&
                 fd.desc.f == pollset->wakeup_pipe[0]) {
-                drain_wakeup_pipe(pollset->wakeup_pipe);
+                apr_pollset_drain_wakeup_pipe(pollset->wakeup_pipe);
                 rv = APR_EINTR;
             }
             else {
@@ -455,7 +455,7 @@
             if ((pollcb->flags & APR_POLLSET_WAKEABLE) &&
                 pollfd->desc_type == APR_POLL_FILE &&
                 pollfd->desc.f == pollcb->wakeup_pipe[0]) {
-                drain_wakeup_pipe(pollcb->wakeup_pipe);
+                apr_pollset_drain_wakeup_pipe(pollcb->wakeup_pipe);
                 return APR_EINTR;
             }
 
Index: poll/unix/select.c
===================================================================
--- poll/unix/select.c	(revision 901825)
+++ poll/unix/select.c	(working copy)
@@ -382,7 +382,7 @@
         else {
             if ((pollset->flags & APR_POLLSET_WAKEABLE) &&
                 pollset->p->query_set[i].desc.f == pollset->wakeup_pipe[0]) {
-                drain_wakeup_pipe(pollset->wakeup_pipe);
+                apr_pollset_drain_wakeup_pipe(pollset->wakeup_pipe);
                 rv = APR_EINTR;
                 continue;
             }
Index: poll/unix/pollset.c
===================================================================
--- poll/unix/pollset.c	(revision 901825)
+++ poll/unix/pollset.c	(working copy)
@@ -37,7 +37,7 @@
         (*pollset->provider->cleanup)(pollset);
     }
     if (pollset->flags & APR_POLLSET_WAKEABLE) {
-        close_wakeup_pipe(pollset->wakeup_pipe);
+        apr_pollset_close_wakeup_pipe(pollset->wakeup_pipe);
     }
 
     return APR_SUCCESS;
@@ -156,8 +156,8 @@
         apr_pollfd_t pfd;
 
         /* Create wakeup pipe */
-        if ((rv = create_wakeup_pipe(pollset->pool, &pfd,
-                                     pollset->wakeup_pipe)) != APR_SUCCESS) {
+        if ((rv = apr_pollset_create_wakeup_pipe(pollset->pool, &pfd,
+                                                 pollset->wakeup_pipe)) != APR_SUCCESS) {
             return rv;
         }
 
Index: poll/unix/port.c
===================================================================
--- poll/unix/port.c	(revision 901825)
+++ poll/unix/port.c	(working copy)
@@ -405,7 +405,7 @@
             if ((pollset->flags & APR_POLLSET_WAKEABLE) &&
                 fp.desc_type == APR_POLL_FILE &&
                 fp.desc.f == pollset->wakeup_pipe[0]) {
-                drain_wakeup_pipe(pollset->wakeup_pipe);
+                apr_pollset_drain_wakeup_pipe(pollset->wakeup_pipe);
                 rv = APR_EINTR;
             }
             else {
@@ -554,7 +554,7 @@
             if ((pollfd->flags & APR_POLLSET_WAKEABLE) &&
                 pollfd->desc_type == APR_POLL_FILE &&
                 pollfd->desc.f == pollfd->wakeup_pipe[0]) {
-                drain_wakeup_pipe(pollfd->wakeup_pipe);
+                apr_pollset_drain_wakeup_pipe(pollfd->wakeup_pipe);
                 return APR_EINTR;
             }
 
Index: poll/unix/poll.c
===================================================================
--- poll/unix/poll.c	(revision 901825)
+++ poll/unix/poll.c	(working copy)
@@ -267,7 +267,7 @@
                 if ((pollset->flags & APR_POLLSET_WAKEABLE) &&
                     pollset->p->query_set[i].desc_type == APR_POLL_FILE &&
                     pollset->p->query_set[i].desc.f == pollset->wakeup_pipe[0]) {
-                    drain_wakeup_pipe(pollset->wakeup_pipe);
+                    apr_pollset_drain_wakeup_pipe(pollset->wakeup_pipe);
                     rv = APR_EINTR;
                 }
                 else {
@@ -407,7 +407,7 @@
                 if ((pollcb->flags & APR_POLLSET_WAKEABLE) &&
                     pollfd->desc_type == APR_POLL_FILE &&
                     pollfd->desc.f == pollcb->wakeup_pipe[0]) {
-                    drain_wakeup_pipe(pollcb->wakeup_pipe);
+                    apr_pollset_drain_wakeup_pipe(pollcb->wakeup_pipe);
                     return APR_EINTR;
                 }
 
Index: poll/unix/epoll.c
===================================================================
--- poll/unix/epoll.c	(revision 901825)
+++ poll/unix/epoll.c	(working copy)
@@ -279,7 +279,7 @@
             if ((pollset->flags & APR_POLLSET_WAKEABLE) &&
                 fdptr->desc_type == APR_POLL_FILE &&
                 fdptr->desc.f == pollset->wakeup_pipe[0]) {
-                drain_wakeup_pipe(pollset->wakeup_pipe);
+                apr_pollset_drain_wakeup_pipe(pollset->wakeup_pipe);
                 rv = APR_EINTR;
             }
             else {
@@ -441,7 +441,7 @@
             if ((pollcb->flags & APR_POLLSET_WAKEABLE) &&
                 pollfd->desc_type == APR_POLL_FILE &&
                 pollfd->desc.f == pollcb->wakeup_pipe[0]) {
-                drain_wakeup_pipe(pollcb->wakeup_pipe);
+                apr_pollset_drain_wakeup_pipe(pollcb->wakeup_pipe);
                 return APR_EINTR;
             }
 
Index: poll/unix/pollcb.c
===================================================================
--- poll/unix/pollcb.c	(revision 901825)
+++ poll/unix/pollcb.c	(working copy)
@@ -80,7 +80,7 @@
         (*pollcb->provider->cleanup)(pollcb);
     }
     if (pollcb->flags & APR_POLLSET_WAKEABLE) {
-        close_wakeup_pipe(pollcb->wakeup_pipe);
+        apr_pollset_close_wakeup_pipe(pollcb->wakeup_pipe);
     }
 
     return APR_SUCCESS;
@@ -158,8 +158,8 @@
 
     if (flags & APR_POLLSET_WAKEABLE) {
         /* Create wakeup pipe */
-        if ((rv = create_wakeup_pipe(pollcb->pool, &pollcb->wakeup_pfd,
-                                     pollcb->wakeup_pipe)) != APR_SUCCESS) {
+        if ((rv = apr_pollset_create_wakeup_pipe(pollcb->pool, &pollcb->wakeup_pfd,
+                                                 pollcb->wakeup_pipe)) != APR_SUCCESS) {
             return rv;
         }
 
Index: poll/unix/wakeup.c
===================================================================
--- poll/unix/wakeup.c	(revision 901825)
+++ poll/unix/wakeup.c	(working copy)
@@ -27,8 +27,8 @@
 
 #ifdef WIN32
 
-apr_status_t create_wakeup_pipe(apr_pool_t *pool, apr_pollfd_t *pfd,
-                                apr_file_t **wakeup_pipe)
+apr_status_t apr_pollset_create_wakeup_pipe(apr_pool_t *pool, apr_pollfd_t *pfd,
+                                            apr_file_t **wakeup_pipe)
 {
     apr_status_t rv;
 
@@ -42,7 +42,7 @@
     return APR_SUCCESS;
 }
 
-apr_status_t close_wakeup_pipe(apr_file_t **wakeup_pipe)
+apr_status_t apr_pollset_close_wakeup_pipe(apr_file_t **wakeup_pipe)
 {
     apr_status_t rv0 = APR_SUCCESS;
     apr_status_t rv1 = APR_SUCCESS;
@@ -61,12 +61,13 @@
 
 #else /* !WIN32 */
 
-apr_status_t create_wakeup_pipe(apr_pollfd_t *pfd, apr_file_t **wakeup_pipe)
+apr_status_t apr_pollset_create_wakeup_pipe(apr_pollfd_t *pfd,
+                                            apr_file_t **wakeup_pipe)
 {
     return APR_ENOTIMPL;
 }
 
-apr_status_t close_wakeup_pipe(apr_file_t **wakeup_pipe)
+apr_status_t apr_pollset_close_wakeup_pipe(apr_file_t **wakeup_pipe)
 {
     return APR_ENOTIMPL;
 }
@@ -75,8 +76,8 @@
 
 #else  /* APR_FILES_AS_SOCKETS */
 
-apr_status_t create_wakeup_pipe(apr_pool_t *pool, apr_pollfd_t *pfd,
-                                apr_file_t **wakeup_pipe)
+apr_status_t apr_pollset_create_wakeup_pipe(apr_pool_t *pool, apr_pollfd_t *pfd,
+                                            apr_file_t **wakeup_pipe)
 {
     apr_status_t rv;
 
@@ -113,7 +114,7 @@
     return APR_SUCCESS;
 }
 
-apr_status_t close_wakeup_pipe(apr_file_t **wakeup_pipe)
+apr_status_t apr_pollset_close_wakeup_pipe(apr_file_t **wakeup_pipe)
 {
     apr_status_t rv0 = APR_SUCCESS;
     apr_status_t rv1 = APR_SUCCESS;
@@ -134,7 +135,7 @@
 
 /* Read and discard whatever is in the wakeup pipe.
  */
-void drain_wakeup_pipe(apr_file_t **wakeup_pipe)
+void apr_pollset_drain_wakeup_pipe(apr_file_t **wakeup_pipe)
 {
     char rb[512];
     apr_size_t nr = sizeof(rb);