diff --git a/oshmem/mca/atomic/base/atomic_base_available.c b/oshmem/mca/atomic/base/atomic_base_available.c
index 6209c63079..2e5a071bb4 100644
--- a/oshmem/mca/atomic/base/atomic_base_available.c
+++ b/oshmem/mca/atomic/base/atomic_base_available.c
@@ -14,15 +14,13 @@
 
 #include "oshmem_config.h"
 
-#include "orte/util/show_help.h"
-
 #include "opal/class/opal_list.h"
-#include "opal/util/output.h"
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "opal/mca/base/mca_base_component_repository.h"
 
 #include "oshmem/constants.h"
+#include "oshmem/util/oshmem_util.h"
 #include "oshmem/mca/atomic/atomic.h"
 #include "oshmem/mca/atomic/base/base.h"
 
diff --git a/oshmem/mca/atomic/base/atomic_base_select.c b/oshmem/mca/atomic/base/atomic_base_select.c
index 8e344986e3..b1db422883 100644
--- a/oshmem/mca/atomic/base/atomic_base_select.c
+++ b/oshmem/mca/atomic/base/atomic_base_select.c
@@ -17,8 +17,7 @@
 #include "oshmem/constants.h"
 
 #include "opal/class/opal_list.h"
-#include "opal/util/output.h"
-#include "orte/util/show_help.h"
+#include "oshmem/util/oshmem_util.h"
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "opal/mca/base/mca_base_component_repository.h"
diff --git a/oshmem/mca/memheap/base/memheap_base_alloc.c b/oshmem/mca/memheap/base/memheap_base_alloc.c
index 13a525550d..8575bea9b1 100644
--- a/oshmem/mca/memheap/base/memheap_base_alloc.c
+++ b/oshmem/mca/memheap/base/memheap_base_alloc.c
@@ -11,8 +11,7 @@
 
 #include "oshmem_config.h"
 
-#include "opal/util/output.h"
-#include "orte/util/show_help.h"
+#include "oshmem/util/oshmem_util.h"
 #include "oshmem/mca/memheap/memheap.h"
 #include "oshmem/mca/memheap/base/base.h"
 
diff --git a/oshmem/mca/memheap/base/memheap_base_mkey.c b/oshmem/mca/memheap/base/memheap_base_mkey.c
index 4a303ff807..7dd1244378 100644
--- a/oshmem/mca/memheap/base/memheap_base_mkey.c
+++ b/oshmem/mca/memheap/base/memheap_base_mkey.c
@@ -13,16 +13,10 @@
 #include "opal/util/output.h"
 #include "opal/dss/dss.h"
 
-#include "orte/mca/rml/rml.h"
-#include "orte/mca/rml/rml_types.h"
-#include "orte/mca/grpcomm/grpcomm.h"
-#include "orte/mca/errmgr/errmgr.h"
-#include "orte/runtime/orte_globals.h"
-
-#include "ompi/mca/bml/bml.h"
 #include "ompi/mca/dpm/dpm.h"
 
 #include "oshmem/proc/proc.h"
+#include "oshmem/util/oshmem_util.h"
 #include "oshmem/runtime/runtime.h"
 #include "oshmem/mca/memheap/memheap.h"
 #include "oshmem/mca/memheap/base/base.h"
@@ -303,7 +297,7 @@ static void do_recv(int source_pe, opal_buffer_t* buffer)
 
     MEMHEAP_VERBOSE(5, "unpacking %d of %d", cnt, OPAL_UINT8);
     rc = opal_dss.unpack(buffer, &msg_type, &cnt, OPAL_UINT8);
-    if (ORTE_SUCCESS != rc) {
+    if (OPAL_SUCCESS != rc) {
         ORTE_ERROR_LOG(rc);
         goto send_fail;
     }
@@ -312,7 +306,7 @@ static void do_recv(int source_pe, opal_buffer_t* buffer)
     case MEMHEAP_RKEY_REQ:
         cnt = 1;
         rc = opal_dss.unpack(buffer, &seg, &cnt, OPAL_UINT32);
-        if (ORTE_SUCCESS != rc) {
+        if (OPAL_SUCCESS != rc) {
             MEMHEAP_ERROR("bad RKEY_REQ msg");
             goto send_fail;
         }
diff --git a/oshmem/mca/memheap/base/memheap_base_register.c b/oshmem/mca/memheap/base/memheap_base_register.c
index 0e7756c027..6e711027c7 100644
--- a/oshmem/mca/memheap/base/memheap_base_register.c
+++ b/oshmem/mca/memheap/base/memheap_base_register.c
@@ -9,6 +9,7 @@
  */
 #include "oshmem_config.h"
 
+#include "oshmem/util/oshmem_util.h"
 #include "oshmem/proc/proc.h"
 #include "oshmem/mca/memheap/memheap.h"
 #include "oshmem/mca/memheap/base/base.h"
diff --git a/oshmem/mca/memheap/base/memheap_base_select.c b/oshmem/mca/memheap/base/memheap_base_select.c
index 2660840fc0..e72869eb03 100644
--- a/oshmem/mca/memheap/base/memheap_base_select.c
+++ b/oshmem/mca/memheap/base/memheap_base_select.c
@@ -11,15 +11,14 @@
 #include "oshmem_config.h"
 
 #include "opal/util/argv.h"
-#include "opal/util/output.h"
-#include "orte/util/show_help.h"
+#include "opal/util/show_help.h"
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "opal/mca/base/mca_base_component_repository.h"
+#include "oshmem/util/oshmem_util.h"
 #include "oshmem/mca/memheap/memheap.h"
 #include "oshmem/mca/memheap/base/base.h"
 #include "orte/mca/errmgr/errmgr.h"
-#include "opal/runtime/opal.h"
 
 mca_memheap_base_module_t mca_memheap;
 
@@ -151,7 +150,7 @@ int mca_memheap_base_select()
 
     /* Verify that some module was initialized */
     if (NULL == mca_memheap_base_module_initialized) {
-        orte_show_help("help-shmem-mca.txt",
+        opal_show_help("help-shmem-mca.txt",
                        "find-available:none-found",
                        true,
                        "memheap");
diff --git a/oshmem/mca/memheap/base/memheap_base_static.c b/oshmem/mca/memheap/base/memheap_base_static.c
index eb4df99c5c..dbc3af4810 100644
--- a/oshmem/mca/memheap/base/memheap_base_static.c
+++ b/oshmem/mca/memheap/base/memheap_base_static.c
@@ -9,6 +9,7 @@
  */
 #include "oshmem_config.h"
 
+#include "oshmem/util/oshmem_util.h"
 #include "oshmem/proc/proc.h"
 #include "oshmem/mca/memheap/memheap.h"
 #include "oshmem/mca/memheap/base/base.h"
diff --git a/oshmem/mca/scoll/base/scoll_base_available.c b/oshmem/mca/scoll/base/scoll_base_available.c
index f1a36fec0b..52cea95b2c 100644
--- a/oshmem/mca/scoll/base/scoll_base_available.c
+++ b/oshmem/mca/scoll/base/scoll_base_available.c
@@ -14,14 +14,13 @@
 
 #include "oshmem_config.h"
 
-#include "orte/util/show_help.h"
-
 #include "opal/class/opal_list.h"
 #include "opal/util/output.h"
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "opal/mca/base/mca_base_component_repository.h"
 
+#include "oshmem/util/oshmem_util.h"
 #include "oshmem/constants.h"
 #include "oshmem/mca/scoll/scoll.h"
 #include "oshmem/mca/scoll/base/base.h"
diff --git a/oshmem/mca/scoll/base/scoll_base_select.c b/oshmem/mca/scoll/base/scoll_base_select.c
index 78d8020a84..1d240d8860 100644
--- a/oshmem/mca/scoll/base/scoll_base_select.c
+++ b/oshmem/mca/scoll/base/scoll_base_select.c
@@ -18,11 +18,11 @@
 
 #include "opal/class/opal_list.h"
 #include "opal/util/output.h"
-#include "orte/util/show_help.h"
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "opal/mca/base/mca_base_component_repository.h"
 
+#include "oshmem/util/oshmem_util.h"
 #include "oshmem/mca/scoll/scoll.h"
 #include "oshmem/mca/scoll/base/base.h"
 #include "oshmem/proc/proc.h"
diff --git a/oshmem/mca/spml/base/spml_base_select.c b/oshmem/mca/spml/base/spml_base_select.c
index c3be1a2df4..0d31c5d831 100644
--- a/oshmem/mca/spml/base/spml_base_select.c
+++ b/oshmem/mca/spml/base/spml_base_select.c
@@ -14,15 +14,13 @@
 #include <string.h>
 #endif
 
-#include "opal/util/output.h"
+#include "opal/util/show_help.h"
 #include "opal/mca/base/base.h"
 #include "opal/runtime/opal.h"
 
 #include "orte/mca/errmgr/errmgr.h"
-#include "orte/util/show_help.h"
-#include "orte/util/name_fns.h"
-#include "orte/runtime/orte_globals.h"
 
+#include "oshmem/util/oshmem_util.h"
 #include "oshmem/constants.h"
 #include "oshmem/mca/spml/spml.h"
 #include "oshmem/mca/spml/base/base.h"
@@ -138,7 +136,7 @@ int mca_spml_base_select(bool enable_progress_threads, bool enable_mpi_threads)
     /* Finished querying all components.  Check for the bozo case. */
 
     if (NULL == best_component) {
-        orte_show_help("help-shmem-mca.txt",
+        opal_show_help("help-shmem-mca.txt",
                        "find-available:none-found",
                        true,
                        "spml");