diff --git a/src/mca/oob/base/oob_base_xcast.c b/src/mca/oob/base/oob_base_xcast.c
index 8157901b36..8078b4fa69 100644
--- a/src/mca/oob/base/oob_base_xcast.c
+++ b/src/mca/oob/base/oob_base_xcast.c
@@ -24,7 +24,7 @@
 #include "mca/ns/ns.h"
 #include "mca/gpr/gpr.h"
 #include "mca/errmgr/errmgr.h"
-#include "mca/soh/soh.h"
+#include "mca/soh/base/base.h"
 #include "runtime/runtime.h"
 
 
diff --git a/src/mca/pls/fork/pls_fork_module.c b/src/mca/pls/fork/pls_fork_module.c
index d7bb734d49..d194ce16b3 100644
--- a/src/mca/pls/fork/pls_fork_module.c
+++ b/src/mca/pls/fork/pls_fork_module.c
@@ -45,6 +45,7 @@
 #include "mca/rmaps/base/base.h"
 #include "mca/rmaps/base/rmaps_base_map.h"
 #include "mca/soh/soh.h"
+#include "mca/soh/base/base.h"
 #include "pls_fork.h"
 
 
diff --git a/src/mca/pls/rsh/pls_rsh_module.c b/src/mca/pls/rsh/pls_rsh_module.c
index 73c2ad8af5..9d6e58fd42 100644
--- a/src/mca/pls/rsh/pls_rsh_module.c
+++ b/src/mca/pls/rsh/pls_rsh_module.c
@@ -41,6 +41,7 @@
 #include "mca/ras/base/ras_base_node.h"
 #include "mca/rmaps/base/rmaps_base_map.h"
 #include "mca/soh/soh.h"
+#include "mca/soh/base/base.h"
 #include "pls_rsh.h"
 
 #define NUM_CONCURRENT 128
diff --git a/src/mca/soh/soh.h b/src/mca/soh/soh.h
index 4592ec7ef5..b7af1e1a22 100644
--- a/src/mca/soh/soh.h
+++ b/src/mca/soh/soh.h
@@ -137,12 +137,4 @@ typedef orte_soh_base_component_1_0_0_t orte_soh_base_component_t;
   /* soh v1.0 */ \
   "soh", 1, 0, 0
 
-/**
-  * Global structure for accessing SOH functions
-  */
-
-OMPI_DECLSPEC extern orte_soh_base_module_t orte_soh;  /* holds selected module's function pointers */
-
-
-
 #endif /* ORTE_SOH_H */
diff --git a/src/mpi/runtime/ompi_mpi_finalize.c b/src/mpi/runtime/ompi_mpi_finalize.c
index 16cce1bdde..c4384709fe 100644
--- a/src/mpi/runtime/ompi_mpi_finalize.c
+++ b/src/mpi/runtime/ompi_mpi_finalize.c
@@ -53,11 +53,11 @@
 #include "mca/gpr/gpr.h"
 #include "mca/rml/rml.h"
 #include "mca/soh/soh.h"
+#include "mca/soh/base/base.h"
 #include "mca/errmgr/errmgr.h"
 #include "mca/mpool/base/base.h"
 
 
-
 int ompi_mpi_finalize(void)
 {
     int ret;
diff --git a/src/mpi/runtime/ompi_mpi_init.c b/src/mpi/runtime/ompi_mpi_init.c
index 826ffb5d01..debddc1ac0 100644
--- a/src/mpi/runtime/ompi_mpi_init.c
+++ b/src/mpi/runtime/ompi_mpi_init.c
@@ -57,6 +57,7 @@
 #include "mca/gpr/gpr.h"
 #include "mca/rml/rml.h"
 #include "mca/soh/soh.h"
+#include "mca/soh/base/base.h"
 #include "mca/errmgr/errmgr.h"
 
 #include "runtime/runtime.h"
diff --git a/src/tools/orted/orted.c b/src/tools/orted/orted.c
index 9fcca7d4ae..2422863118 100644
--- a/src/tools/orted/orted.c
+++ b/src/tools/orted/orted.c
@@ -55,6 +55,7 @@
 #include "mca/gpr/gpr.h"
 #include "mca/rml/rml.h"
 #include "mca/soh/soh.h"
+#include "mca/soh/base/base.h"
 
 #include "runtime/runtime.h"