diff --git a/opal/mca/pmix/external/pmix_ext_client.c b/opal/mca/pmix/external/pmix_ext_client.c
index d80db3d082..b9da10c177 100644
--- a/opal/mca/pmix/external/pmix_ext_client.c
+++ b/opal/mca/pmix/external/pmix_ext_client.c
@@ -30,12 +30,19 @@
 #include "opal/mca/pmix/base/base.h"
 #include "pmix_ext.h"
 #include "pmix.h"
-#include "src/buffer_ops/buffer_ops.h"
 
 static pmix_proc_t my_proc;
 static char *dbgvalue=NULL;
 static int errhdler_ref = 0;
 
+#define PMIX_WAIT_FOR_COMPLETION(a)             \
+    do {                                        \
+        while ((a)) {                           \
+            usleep(10);                         \
+        }                                       \
+    } while (0)
+
+
 static void completion_handler (void * cbdata) {
     int * cond = (int *)cbdata;
     *cond = 0;