diff --git a/ompi/class/ompi_free_list.c b/ompi/class/ompi_free_list.c
index 04883dd999..a585b71b98 100644
--- a/ompi/class/ompi_free_list.c
+++ b/ompi/class/ompi_free_list.c
@@ -21,7 +21,7 @@
 #include "ompi/class/ompi_free_list.h"
 #include "opal/sys/cache.h"
 #include "opal/util/output.h"
-
+#include "ompi/mca/mpool/mpool.h"
 
 static void ompi_free_list_construct(ompi_free_list_t* fl);
 static void ompi_free_list_destruct(ompi_free_list_t* fl);
diff --git a/ompi/class/ompi_free_list.h b/ompi/class/ompi_free_list.h
index 662fbb0db2..6583aa9043 100644
--- a/ompi/class/ompi_free_list.h
+++ b/ompi/class/ompi_free_list.h
@@ -24,7 +24,6 @@
 #include "opal/threads/threads.h"
 #include "opal/threads/condition.h"
 #include "ompi/constants.h"
-#include "ompi/mca/mpool/mpool.h"
 #include "opal/sys/cache.h"
 
 #if defined(c_plusplus) || defined(__cplusplus)
@@ -43,7 +42,7 @@ struct ompi_free_list_t
     size_t fl_num_waiting;
     size_t fl_elem_size;
     opal_class_t* fl_elem_class;
-    mca_mpool_base_module_t* fl_mpool;
+    struct mca_mpool_base_module_t* fl_mpool;
     opal_mutex_t fl_lock;
     opal_condition_t fl_condition; 
     opal_list_t fl_allocations;
@@ -78,7 +77,7 @@ OMPI_DECLSPEC int ompi_free_list_init(
     int num_elements_to_alloc,
     int max_elements_to_alloc,
     int num_elements_per_alloc,
-    mca_mpool_base_module_t*);
+    struct mca_mpool_base_module_t*);
 
 OMPI_DECLSPEC int ompi_free_list_grow(ompi_free_list_t* flist, size_t num_elements);
 
diff --git a/ompi/mca/btl/btl.h b/ompi/mca/btl/btl.h
index f4483296dc..6eff721a9c 100644
--- a/ompi/mca/btl/btl.h
+++ b/ompi/mca/btl/btl.h
@@ -112,7 +112,7 @@
 #define MCA_BTL_H
 
 #include "ompi/types.h"
-#include "ompi/class/ompi_free_list.h"
+#include "ompi/mca/mpool/mpool.h"
 
 /*
  * BTL types
diff --git a/ompi/mca/mpool/base/mpool_base_alloc.c b/ompi/mca/mpool/base/mpool_base_alloc.c
index b265dd44b6..4cc93fe45d 100644
--- a/ompi/mca/mpool/base/mpool_base_alloc.c
+++ b/ompi/mca/mpool/base/mpool_base_alloc.c
@@ -47,7 +47,7 @@ static void mca_mpool_base_registration_destructor( mca_mpool_base_registration_
 
 OBJ_CLASS_INSTANCE(
     mca_mpool_base_registration_t,
-    opal_list_item_t,
+    ompi_free_list_item_t,
     mca_mpool_base_registration_constructor,
     mca_mpool_base_registration_destructor);
 
diff --git a/ompi/mca/mpool/mpool.h b/ompi/mca/mpool/mpool.h
index 80a9862d46..3b20dbf296 100644
--- a/ompi/mca/mpool/mpool.h
+++ b/ompi/mca/mpool/mpool.h
@@ -23,7 +23,7 @@
 #define MCA_MPOOL_H
 #include "opal/mca/mca.h"
 #include "ompi/info/info.h"
-#include "opal/class/opal_list.h" 
+#include "ompi/class/ompi_free_list.h" 
 #include "ompi/class/ompi_pointer_array.h" 
 
 #define MCA_MPOOL_FLAGS_CACHE 0x1
@@ -33,7 +33,7 @@
 struct mca_mpool_base_resources_t;
 
 struct mca_mpool_base_registration_t { 
-    opal_list_item_t super; 
+    ompi_free_list_item_t super; 
     struct mca_mpool_base_module_t *mpool; 
     unsigned char* base;
     unsigned char* bound; 
@@ -185,8 +185,8 @@ struct mca_mpool_base_module_t {
     mca_mpool_base_module_register_fn_t mpool_register;  /**< register memory */
     mca_mpool_base_module_deregister_fn_t mpool_deregister; /**< deregister memory */
     mca_mpool_base_module_find_fn_t mpool_find; /**< find regisrations in the cache */
-    mca_mpool_base_module_retain_fn_t mpool_retain; /**< retain a regisrtation from the cache */ 
-    mca_mpool_base_module_release_fn_t mpool_release; /**< release a regisrtation from the cache */ 
+    mca_mpool_base_module_retain_fn_t mpool_retain; /**< retain a registration from the cache */ 
+    mca_mpool_base_module_release_fn_t mpool_release; /**< release a registration from the cache */ 
     mca_mpool_base_module_finalize_fn_t mpool_finalize;  /**< finalize */
     struct mca_rcache_base_module_t *rcache; /* the rcache associated with this mpool */ 
     uint32_t flags; /**< mpool flags */
diff --git a/ompi/mca/mpool/mvapi/mpool_mvapi_module.c b/ompi/mca/mpool/mvapi/mpool_mvapi_module.c
index 9033340cb6..a69bf7d4a9 100644
--- a/ompi/mca/mpool/mvapi/mpool_mvapi_module.c
+++ b/ompi/mca/mpool/mvapi/mpool_mvapi_module.c
@@ -253,26 +253,3 @@ int mca_mpool_mvapi_retain(struct mca_mpool_base_module_t* mpool,
     return OMPI_SUCCESS; 
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-