diff --git a/src/mca/io/romio/romio-dist/adio/ad_hfs/Makefile.am b/src/mca/io/romio/romio-dist/adio/ad_hfs/Makefile.am
index ab8d7f807b..fb8e4caab0 100644
--- a/src/mca/io/romio/romio-dist/adio/ad_hfs/Makefile.am
+++ b/src/mca/io/romio/romio-dist/adio/ad_hfs/Makefile.am
@@ -6,9 +6,10 @@ include $(top_ompi_srcdir)/config/Makefile.options
 
 AM_CPPFLAGS = \
         -DOMPI_BUILDING=1 \
-        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_builddir)/include \
         -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include
+        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_srcdir)/adio/include
 
 # It is unfortunately necessary to make all the filenames in the ROMIO
 # distribtion confrom to the MCA prefix name rule -- there is at least
diff --git a/src/mca/io/romio/romio-dist/adio/ad_nfs/Makefile.am b/src/mca/io/romio/romio-dist/adio/ad_nfs/Makefile.am
index 4f4adf019b..3f4ee083b3 100644
--- a/src/mca/io/romio/romio-dist/adio/ad_nfs/Makefile.am
+++ b/src/mca/io/romio/romio-dist/adio/ad_nfs/Makefile.am
@@ -6,9 +6,10 @@ include $(top_ompi_srcdir)/config/Makefile.options
 
 AM_CPPFLAGS = \
         -DOMPI_BUILDING=1 \
-        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_builddir)/include \
         -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include
+        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_srcdir)/adio/include
 
 # It is unfortunately necessary to make all the filenames in the ROMIO
 # distribtion confrom to the MCA prefix name rule -- there is at least
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ntfs/Makefile.am b/src/mca/io/romio/romio-dist/adio/ad_ntfs/Makefile.am
index ea3b2a5420..0c33f89bcf 100644
--- a/src/mca/io/romio/romio-dist/adio/ad_ntfs/Makefile.am
+++ b/src/mca/io/romio/romio-dist/adio/ad_ntfs/Makefile.am
@@ -6,9 +6,10 @@ include $(top_ompi_srcdir)/config/Makefile.options
 
 AM_CPPFLAGS = \
         -DOMPI_BUILDING=1 \
-        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_builddir)/include \
         -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include
+        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_srcdir)/adio/include
 
 # It is unfortunately necessary to make all the filenames in the ROMIO
 # distribtion confrom to the MCA prefix name rule -- there is at least
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pfs/Makefile.am b/src/mca/io/romio/romio-dist/adio/ad_pfs/Makefile.am
index d2a88c6a02..3beafe9f0d 100644
--- a/src/mca/io/romio/romio-dist/adio/ad_pfs/Makefile.am
+++ b/src/mca/io/romio/romio-dist/adio/ad_pfs/Makefile.am
@@ -6,9 +6,10 @@ include $(top_ompi_srcdir)/config/Makefile.options
 
 AM_CPPFLAGS = \
         -DOMPI_BUILDING=1 \
-        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_builddir)/include \
         -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include
+        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_srcdir)/adio/include
 
 # It is unfortunately necessary to make all the filenames in the ROMIO
 # distribtion confrom to the MCA prefix name rule -- there is at least
diff --git a/src/mca/io/romio/romio-dist/adio/ad_piofs/Makefile.am b/src/mca/io/romio/romio-dist/adio/ad_piofs/Makefile.am
index 1bb730b6ea..2e07f0b8d3 100644
--- a/src/mca/io/romio/romio-dist/adio/ad_piofs/Makefile.am
+++ b/src/mca/io/romio/romio-dist/adio/ad_piofs/Makefile.am
@@ -6,9 +6,10 @@ include $(top_ompi_srcdir)/config/Makefile.options
 
 AM_CPPFLAGS = \
         -DOMPI_BUILDING=1 \
-        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_builddir)/include \
         -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include
+        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_srcdir)/adio/include
 
 # It is unfortunately necessary to make all the filenames in the ROMIO
 # distribtion confrom to the MCA prefix name rule -- there is at least
diff --git a/src/mca/io/romio/romio-dist/adio/ad_pvfs/Makefile.am b/src/mca/io/romio/romio-dist/adio/ad_pvfs/Makefile.am
index 5f5378aa06..6e17fedaa3 100644
--- a/src/mca/io/romio/romio-dist/adio/ad_pvfs/Makefile.am
+++ b/src/mca/io/romio/romio-dist/adio/ad_pvfs/Makefile.am
@@ -6,9 +6,10 @@ include $(top_ompi_srcdir)/config/Makefile.options
 
 AM_CPPFLAGS = \
         -DOMPI_BUILDING=1 \
-        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_builddir)/include \
         -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include
+        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_srcdir)/adio/include
 
 # It is unfortunately necessary to make all the filenames in the ROMIO
 # distribtion confrom to the MCA prefix name rule -- there is at least
diff --git a/src/mca/io/romio/romio-dist/adio/ad_sfs/Makefile.am b/src/mca/io/romio/romio-dist/adio/ad_sfs/Makefile.am
index c5542f2d75..40dfec75cd 100644
--- a/src/mca/io/romio/romio-dist/adio/ad_sfs/Makefile.am
+++ b/src/mca/io/romio/romio-dist/adio/ad_sfs/Makefile.am
@@ -6,9 +6,10 @@ include $(top_ompi_srcdir)/config/Makefile.options
 
 AM_CPPFLAGS = \
         -DOMPI_BUILDING=1 \
-        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_builddir)/include \
         -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include
+        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_srcdir)/adio/include
 
 # It is unfortunately necessary to make all the filenames in the ROMIO
 # distribtion confrom to the MCA prefix name rule -- there is at least
diff --git a/src/mca/io/romio/romio-dist/adio/ad_testfs/Makefile.am b/src/mca/io/romio/romio-dist/adio/ad_testfs/Makefile.am
index 7bc00b3545..065c6f82b9 100644
--- a/src/mca/io/romio/romio-dist/adio/ad_testfs/Makefile.am
+++ b/src/mca/io/romio/romio-dist/adio/ad_testfs/Makefile.am
@@ -6,9 +6,10 @@ include $(top_ompi_srcdir)/config/Makefile.options
 
 AM_CPPFLAGS = \
         -DOMPI_BUILDING=1 \
-        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_builddir)/include \
         -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include
+        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_srcdir)/adio/include
 
 # It is unfortunately necessary to make all the filenames in the ROMIO
 # distribtion confrom to the MCA prefix name rule -- there is at least
diff --git a/src/mca/io/romio/romio-dist/adio/ad_ufs/Makefile.am b/src/mca/io/romio/romio-dist/adio/ad_ufs/Makefile.am
index 5ac6fd35f8..528f5857d4 100644
--- a/src/mca/io/romio/romio-dist/adio/ad_ufs/Makefile.am
+++ b/src/mca/io/romio/romio-dist/adio/ad_ufs/Makefile.am
@@ -6,9 +6,10 @@ include $(top_ompi_srcdir)/config/Makefile.options
 
 AM_CPPFLAGS = \
         -DOMPI_BUILDING=1 \
-        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_builddir)/include \
         -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include
+        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_srcdir)/adio/include
 
 # It is unfortunately necessary to make all the filenames in the ROMIO
 # distribtion confrom to the MCA prefix name rule -- there is at least
diff --git a/src/mca/io/romio/romio-dist/adio/ad_xfs/Makefile.am b/src/mca/io/romio/romio-dist/adio/ad_xfs/Makefile.am
index 3bf7835ecf..f7e35f9d8c 100644
--- a/src/mca/io/romio/romio-dist/adio/ad_xfs/Makefile.am
+++ b/src/mca/io/romio/romio-dist/adio/ad_xfs/Makefile.am
@@ -6,9 +6,10 @@ include $(top_ompi_srcdir)/config/Makefile.options
 
 AM_CPPFLAGS = \
         -DOMPI_BUILDING=1 \
-        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_builddir)/include \
         -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include
+        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_srcdir)/adio/include
 
 # It is unfortunately necessary to make all the filenames in the ROMIO
 # distribtion confrom to the MCA prefix name rule -- there is at least
diff --git a/src/mca/io/romio/romio-dist/adio/common/Makefile.am b/src/mca/io/romio/romio-dist/adio/common/Makefile.am
index 909831ad45..babd1d0ca9 100644
--- a/src/mca/io/romio/romio-dist/adio/common/Makefile.am
+++ b/src/mca/io/romio/romio-dist/adio/common/Makefile.am
@@ -4,9 +4,11 @@
 
 include $(top_ompi_srcdir)/config/Makefile.options
 
-AM_CPPFLAGS = -I$(top_ompi_builddir)/src/include \
+AM_CPPFLAGS = \
+        -I$(top_ompi_builddir)/include \
         -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include
+        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_srcdir)/adio/include
 
 # It is unfortunately necessary to make all the filenames in the ROMIO
 # distribtion confrom to the MCA prefix name rule -- there is at least
diff --git a/src/mca/io/romio/romio-dist/mpi-io/Makefile.am b/src/mca/io/romio/romio-dist/mpi-io/Makefile.am
index 97b9730ed1..c9739eb873 100644
--- a/src/mca/io/romio/romio-dist/mpi-io/Makefile.am
+++ b/src/mca/io/romio/romio-dist/mpi-io/Makefile.am
@@ -10,9 +10,11 @@ include $(top_ompi_srcdir)/config/Makefile.options
 
 AM_CPPFLAGS = \
         -DOMPI_BUILDING=1 \
-        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_builddir)/include \
         -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include
+        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_srcdir)/include \
+        -I$(top_srcdir)/adio/include
 
 # It is unfortunately necessary to make all the filenames in the ROMIO
 # distribtion confrom to the MCA prefix name rule -- there is at least
diff --git a/src/mca/io/romio/src/Makefile.am b/src/mca/io/romio/src/Makefile.am
index 5658c284a7..013ab05cb0 100644
--- a/src/mca/io/romio/src/Makefile.am
+++ b/src/mca/io/romio/src/Makefile.am
@@ -5,10 +5,13 @@
 include $(top_ompi_srcdir)/config/Makefile.options
 
 AM_CPPFLAGS = \
+        -I$(top_ompi_builddir)/src \
         -I$(top_ompi_builddir)/src/include \
         -I$(top_ompi_srcdir)/src \
         -I$(top_ompi_srcdir)/src/include \
-        -I$(top_srcdir)
+        -I$(top_srcdir) \
+        -I$(top_srcdir)/romio-dist/include \
+        -I$(top_builddir)
 
 noinst_LTLIBRARIES = libmca_io_romio.la
 libmca_io_romio_la_SOURCES = \