diff --git a/ompi/mca/allocator/base/allocator_base_close.c b/ompi/mca/allocator/base/allocator_base_close.c
index ebc0545d3d..7ab6d39795 100644
--- a/ompi/mca/allocator/base/allocator_base_close.c
+++ b/ompi/mca/allocator/base/allocator_base_close.c
@@ -36,15 +36,9 @@ int mca_allocator_base_close(void)
   /* Close all remaining available modules (may be one if this is a
      OMPI RTE program, or [possibly] multiple if this is ompi_info) */
 
-  mca_base_components_close(mca_allocator_base_output,
-                            &mca_allocator_base_components, NULL);
-
-  /* Close the framework output */
-  opal_output_close (mca_allocator_base_output);
-  mca_allocator_base_output = -1;
+  mca_base_components_close(0, &mca_allocator_base_components, NULL);
 
   /* All done */
-
   return OMPI_SUCCESS;
 }
 
diff --git a/ompi/mca/allocator/base/allocator_base_open.c b/ompi/mca/allocator/base/allocator_base_open.c
index c390423668..71c082aa70 100644
--- a/ompi/mca/allocator/base/allocator_base_open.c
+++ b/ompi/mca/allocator/base/allocator_base_open.c
@@ -40,7 +40,6 @@
  * Global variables
  */
 opal_list_t mca_allocator_base_components;
-int mca_allocator_base_output = -1;
 
 /**
  * Function for finding and opening either all MCA components, or the one
diff --git a/ompi/mca/coll/base/coll_base_close.c b/ompi/mca/coll/base/coll_base_close.c
index 7475d9cce4..403d9c9600 100644
--- a/ompi/mca/coll/base/coll_base_close.c
+++ b/ompi/mca/coll/base/coll_base_close.c
@@ -24,7 +24,7 @@
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "ompi/mca/coll/base/base.h"
-
+#include "opal/util/output.h"
 
 int mca_coll_base_close(void)
 {
diff --git a/ompi/mca/op/base/op_base_close.c b/ompi/mca/op/base/op_base_close.c
index a5904704ac..8db92558ad 100644
--- a/ompi/mca/op/base/op_base_close.c
+++ b/ompi/mca/op/base/op_base_close.c
@@ -25,7 +25,7 @@
 #include "ompi/constants.h"
 #include "ompi/mca/op/op.h"
 #include "ompi/mca/op/base/base.h"
-
+#include "opal/util/output.h"
 
 int ompi_op_base_close(void)
 {
diff --git a/ompi/mca/pubsub/base/pubsub_base_close.c b/ompi/mca/pubsub/base/pubsub_base_close.c
index e960bb044d..bc39ec8c82 100644
--- a/ompi/mca/pubsub/base/pubsub_base_close.c
+++ b/ompi/mca/pubsub/base/pubsub_base_close.c
@@ -23,6 +23,7 @@
 
 #include "ompi/mca/pubsub/pubsub.h"
 #include "ompi/mca/pubsub/base/base.h"
+#include "opal/util/output.h"
 
 int ompi_pubsub_base_close(void)
 {
diff --git a/opal/mca/hwloc/base/hwloc_base_close.c b/opal/mca/hwloc/base/hwloc_base_close.c
index 8abed7abef..c86939dafd 100644
--- a/opal/mca/hwloc/base/hwloc_base_close.c
+++ b/opal/mca/hwloc/base/hwloc_base_close.c
@@ -14,6 +14,7 @@
 #include "opal/mca/base/base.h"
 #include "opal/mca/hwloc/hwloc.h"
 #include "opal/mca/hwloc/base/base.h"
+#include "opal/util/output.h"
 
 int opal_hwloc_base_close(void)
 {
diff --git a/opal/mca/memchecker/base/memchecker_base_close.c b/opal/mca/memchecker/base/memchecker_base_close.c
index 5c92ebd6da..f30fc12076 100644
--- a/opal/mca/memchecker/base/memchecker_base_close.c
+++ b/opal/mca/memchecker/base/memchecker_base_close.c
@@ -15,6 +15,7 @@
 #include "opal/mca/base/base.h"
 #include "opal/mca/memchecker/base/base.h"
 #include "opal/mca/memchecker/memchecker.h"
+#include "opal/util/output.h"
 
 int opal_memchecker_base_close(void)
 {
diff --git a/opal/mca/pstat/base/pstat_base_close.c b/opal/mca/pstat/base/pstat_base_close.c
index da7001d0ed..30f6306525 100644
--- a/opal/mca/pstat/base/pstat_base_close.c
+++ b/opal/mca/pstat/base/pstat_base_close.c
@@ -24,6 +24,7 @@
 #include "opal/mca/base/base.h"
 #include "opal/mca/pstat/pstat.h"
 #include "opal/mca/pstat/base/base.h"
+#include "opal/util/output.h"
 
 int opal_pstat_base_close(void)
 {
diff --git a/opal/mca/shmem/base/shmem_base_close.c b/opal/mca/shmem/base/shmem_base_close.c
index a64bbbca3f..030eaf10ef 100644
--- a/opal/mca/shmem/base/shmem_base_close.c
+++ b/opal/mca/shmem/base/shmem_base_close.c
@@ -26,6 +26,7 @@
 #include "opal/mca/base/base.h"
 #include "opal/mca/shmem/shmem.h"
 #include "opal/mca/shmem/base/base.h"
+#include "opal/util/output.h"
 
 /* ////////////////////////////////////////////////////////////////////////// */
 int