diff --git a/ompi/mca/rcache/base/rcache_base_close.c b/ompi/mca/rcache/base/rcache_base_close.c
index 71042f908b..ed6eb2b055 100644
--- a/ompi/mca/rcache/base/rcache_base_close.c
+++ b/ompi/mca/rcache/base/rcache_base_close.c
@@ -51,7 +51,7 @@ int mca_rcache_base_close(void)
   }
 
   /* Close all remaining available components (may be one if this is a
-     OMPI RTE program, or [possibly] multiple if this is ompi_info) */
+     OMPI RTE program, or [possibly] multiple if this is the ompi_info-tool) */
 
   mca_base_components_close(mca_rcache_base_output, 
                             &mca_rcache_base_components, NULL);
diff --git a/ompi/mca/rcache/base/rcache_base_open.c b/ompi/mca/rcache/base/rcache_base_open.c
index f4b15b054b..c33db77bd5 100644
--- a/ompi/mca/rcache/base/rcache_base_open.c
+++ b/ompi/mca/rcache/base/rcache_base_open.c
@@ -65,8 +65,7 @@ int mca_rcache_base_open(void)
   }
 
   /* Initialize the list so that in mca_rcache_base_close(), we can
-     iterate over it (even if it's empty, as in the case of
-     ompi_info) */
+     iterate over it (even if it's empty, as in the case of the ompi_info-tool) */
 
   OBJ_CONSTRUCT(&mca_rcache_base_modules, opal_list_t);
 
diff --git a/ompi/mca/rcache/rb/rcache_rb.h b/ompi/mca/rcache/rb/rcache_rb.h
index cf75e80396..dca4368143 100644
--- a/ompi/mca/rcache/rb/rcache_rb.h
+++ b/ompi/mca/rcache/rb/rcache_rb.h
@@ -24,7 +24,6 @@
 #define MCA_RCACHE_RB_H
 
 #include "opal/mca/mca.h"
-#include "ompi/info/info.h"
 #include "opal/class/opal_list.h" 
 #include "ompi/class/ompi_rb_tree.h"
 #include "ompi/mca/rcache/rcache.h"
diff --git a/ompi/mca/rcache/rb/rcache_rb_mru.h b/ompi/mca/rcache/rb/rcache_rb_mru.h
index f9dd6a70ae..8365d45b97 100644
--- a/ompi/mca/rcache/rb/rcache_rb_mru.h
+++ b/ompi/mca/rcache/rb/rcache_rb_mru.h
@@ -23,7 +23,6 @@
 #ifndef MCA_RCACHE_RB_MRU_H
 #define MCA_RCACHE_RB_MRU_H
 #include "opal/mca/mca.h"
-#include "ompi/info/info.h"
 #include "opal/class/opal_list.h" 
 #include "rcache_rb.h"
 
diff --git a/ompi/mca/rcache/rb/rcache_rb_tree.h b/ompi/mca/rcache/rb/rcache_rb_tree.h
index fe993ecc87..658425ef42 100644
--- a/ompi/mca/rcache/rb/rcache_rb_tree.h
+++ b/ompi/mca/rcache/rb/rcache_rb_tree.h
@@ -23,7 +23,6 @@
 #ifndef MCA_RCACHE_RB_TREE_H
 #define MCA_RCACHE_RB_TREE_H
 #include "opal/mca/mca.h"
-#include "ompi/info/info.h"
 #include "ompi/class/ompi_free_list.h"
 #include "ompi/mca/mpool/mpool.h"
 #include "rcache_rb.h"
diff --git a/ompi/mca/rcache/rcache.h b/ompi/mca/rcache/rcache.h
index 85e7161120..5bbe7ab7ef 100644
--- a/ompi/mca/rcache/rcache.h
+++ b/ompi/mca/rcache/rcache.h
@@ -23,7 +23,6 @@
 #ifndef MCA_RCACHE_H
 #define MCA_RCACHE_H
 #include "opal/mca/mca.h"
-#include "ompi/info/info.h"
 #include "opal/class/opal_list.h" 
 #include "ompi/mca/mpool/mpool.h"
 #include "opal/threads/mutex.h"
diff --git a/ompi/mca/rcache/vma/rcache_vma.h b/ompi/mca/rcache/vma/rcache_vma.h
index 7386edf8f1..440d35a86b 100644
--- a/ompi/mca/rcache/vma/rcache_vma.h
+++ b/ompi/mca/rcache/vma/rcache_vma.h
@@ -26,7 +26,6 @@
 #ifndef MCA_RCACHE_VMA_H
 #define MCA_RCACHE_VMA_H
 #include "opal/mca/mca.h"
-#include "ompi/info/info.h"
 #include "opal/class/opal_list.h" 
 #include "ompi/class/ompi_rb_tree.h"
 #include "ompi/mca/rcache/rcache.h"