diff --git a/ompi/mca/btl/mvapi/btl_mvapi.c b/ompi/mca/btl/mvapi/btl_mvapi.c
index 14eb106f74..d54de85a40 100644
--- a/ompi/mca/btl/mvapi/btl_mvapi.c
+++ b/ompi/mca/btl/mvapi/btl_mvapi.c
@@ -26,7 +26,6 @@
 #include "btl_mvapi_proc.h"
 #include "btl_mvapi_endpoint.h"
 #include "datatype/convertor.h" 
-#include "mca/common/vapi/vapi_mem_reg.h" 
 #include "mca/mpool/base/base.h" 
 #include "mca/mpool/mpool.h" 
 #include "mca/mpool/mvapi/mpool_mvapi.h" 
diff --git a/ompi/mca/btl/mvapi/btl_mvapi_component.c b/ompi/mca/btl/mvapi/btl_mvapi_component.c
index 94c4b315ec..6c032b4158 100644
--- a/ompi/mca/btl/mvapi/btl_mvapi_component.c
+++ b/ompi/mca/btl/mvapi/btl_mvapi_component.c
@@ -26,7 +26,6 @@
 
 #include "mca/base/mca_base_param.h"
 #include "mca/errmgr/errmgr.h"
-#include "mca/common/vapi/vapi_mem_reg.h"
 #include "mca/mpool/base/base.h" 
 #include "btl_mvapi.h"
 #include "btl_mvapi_frag.h"
diff --git a/ompi/mca/btl/mvapi/btl_mvapi_frag.c b/ompi/mca/btl/mvapi/btl_mvapi_frag.c
index 80e735624b..8793df8272 100644
--- a/ompi/mca/btl/mvapi/btl_mvapi_frag.c
+++ b/ompi/mca/btl/mvapi/btl_mvapi_frag.c
@@ -16,7 +16,6 @@
 
 
 #include "btl_mvapi_frag.h" 
-#include "mca/common/vapi/vapi_mem_reg.h"
 #include "mca/mpool/mvapi/mpool_mvapi.h" 
 
 
diff --git a/ompi/mca/common/vapi/vapi_mem_reg.h b/ompi/mca/common/vapi/vapi_mem_reg.h
deleted file mode 100644
index 6b49f52c63..0000000000
--- a/ompi/mca/common/vapi/vapi_mem_reg.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2004-2005 The Trustees of Indiana University.
- *                         All rights reserved.
- * Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
- *                         All rights reserved.
- * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
- *                         University of Stuttgart.  All rights reserved.
- * Copyright (c) 2004-2005 The Regents of the University of California.
- *                         All rights reserved.
- * $COPYRIGHT$
- * 
- * Additional copyrights may follow
- * 
- * $HEADER$
- */
-
-
-#ifndef MCA_COMMON_VAPI_MEM_REG_H
-#define MCA_COMMON_VAPI_MEM_REG_H
-
-#include <vapi.h> 
-#include <vapi_common.h> 
-
-
-#if defined(c_plusplus) || defined(__cplusplus)
-extern "C" {
-#endif
-
-#if defined(c_plusplus) || defined(__cplusplus)
-}
-#endif
-
-#endif
-
-
-
-
-
-
-
-
-
diff --git a/ompi/mca/mpool/mvapi/mpool_mvapi.h b/ompi/mca/mpool/mvapi/mpool_mvapi.h
index bb0be2299c..240c9475d5 100644
--- a/ompi/mca/mpool/mvapi/mpool_mvapi.h
+++ b/ompi/mca/mpool/mvapi/mpool_mvapi.h
@@ -23,8 +23,8 @@
 #include "class/ompi_free_list.h"
 #include "opal/event/event.h"
 #include "mca/mpool/mpool.h"
-#include "mca/common/vapi/vapi_mem_reg.h" 
-
+#include <vapi.h> 
+#include <vapi_types.h>
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {
 #endif
diff --git a/ompi/mca/mpool/mvapi/mpool_mvapi_module.c b/ompi/mca/mpool/mvapi/mpool_mvapi_module.c
index 2dc69c8c9d..8434718bbb 100644
--- a/ompi/mca/mpool/mvapi/mpool_mvapi_module.c
+++ b/ompi/mca/mpool/mvapi/mpool_mvapi_module.c
@@ -18,7 +18,9 @@
 #include <string.h>
 #include "opal/util/output.h"
 #include "mca/mpool/mvapi/mpool_mvapi.h"
-
+#include <vapi.h>
+#include <vapi_types.h> 
+#include <vapi_common.h> 
 
 /* 
  *  Initializes the mpool module.