diff --git a/ompi/mca/btl/sm/btl_sm.h b/ompi/mca/btl/sm/btl_sm.h
index c7f7f0cc16..e500bf2c2f 100644
--- a/ompi/mca/btl/sm/btl_sm.h
+++ b/ompi/mca/btl/sm/btl_sm.h
@@ -24,6 +24,7 @@
 #define MCA_BTL_SM_H
 
 #include "ompi_config.h"
+#include <stddef.h>
 #include <stdlib.h>
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/ompi/mca/mpool/base/mpool_base_close.c b/ompi/mca/mpool/base/mpool_base_close.c
index 6c330b670b..7267c0fe30 100644
--- a/ompi/mca/mpool/base/mpool_base_close.c
+++ b/ompi/mca/mpool/base/mpool_base_close.c
@@ -23,6 +23,7 @@
 #include <stdio.h>
 
 #include "ompi/constants.h"
+#include "opal/class/opal_pointer_array.h"
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "ompi/mca/mpool/mpool.h"
diff --git a/ompi/mca/mpool/base/mpool_base_mem_cb.c b/ompi/mca/mpool/base/mpool_base_mem_cb.c
index 2b6c4dde3c..e3fa8995cc 100644
--- a/ompi/mca/mpool/base/mpool_base_mem_cb.c
+++ b/ompi/mca/mpool/base/mpool_base_mem_cb.c
@@ -20,6 +20,8 @@
  * @file
  */
 #include "ompi_config.h"
+
+#include "opal/class/opal_pointer_array.h"
 #include "mpool_base_mem_cb.h"
 #include "base.h"
 #include "orte/types.h"
diff --git a/ompi/mca/mpool/rdma/mpool_rdma_module.c b/ompi/mca/mpool/rdma/mpool_rdma_module.c
index bbf2114b3b..18a730e16e 100644
--- a/ompi/mca/mpool/rdma/mpool_rdma_module.c
+++ b/ompi/mca/mpool/rdma/mpool_rdma_module.c
@@ -213,7 +213,7 @@ int mca_mpool_rdma_register(mca_mpool_base_module_t *mpool, void *addr,
             mpool_rdma->stat_cache_hit++;
             (*reg)->ref_count++;
             OPAL_THREAD_UNLOCK(&mpool->rcache->lock);
-            return MPI_SUCCESS;
+            return OMPI_SUCCESS;
         }
 
         mpool_rdma->stat_cache_miss++;
@@ -255,7 +255,7 @@ int mca_mpool_rdma_register(mca_mpool_base_module_t *mpool, void *addr,
         if(opal_list_get_end(&mpool_rdma->mru_list) !=
                 (opal_list_item_t*)old_reg) {
             rc = dereg_mem(mpool, old_reg);
-            if(MPI_SUCCESS == rc) {
+            if(OMPI_SUCCESS == rc) {
                 mpool->rcache->rcache_delete(mpool->rcache, old_reg);
                 opal_list_remove_item(&mpool_rdma->mru_list,
                         (opal_list_item_t*)old_reg);