diff --git a/ompi/class/Makefile.am b/ompi/class/Makefile.am
index 4c8647c501..2cea6b7631 100644
--- a/ompi/class/Makefile.am
+++ b/ompi/class/Makefile.am
@@ -22,6 +22,8 @@ noinst_LTLIBRARIES = libclass.la
 # Source code files
 
 headers = \
+        ompi_circular_buffer_fifo.h \
+        ompi_fifo.h \
         ompi_bitmap.h \
         ompi_pointer_array.h
 
diff --git a/opal/class/ompi_circular_buffer_fifo.h b/ompi/class/ompi_circular_buffer_fifo.h
similarity index 100%
rename from opal/class/ompi_circular_buffer_fifo.h
rename to ompi/class/ompi_circular_buffer_fifo.h
diff --git a/opal/class/ompi_fifo.h b/ompi/class/ompi_fifo.h
similarity index 100%
rename from opal/class/ompi_fifo.h
rename to ompi/class/ompi_fifo.h
diff --git a/opal/class/Makefile.am b/opal/class/Makefile.am
index b873163386..08da27a702 100644
--- a/opal/class/Makefile.am
+++ b/opal/class/Makefile.am
@@ -22,8 +22,6 @@ noinst_LTLIBRARIES = libclass.la
 # Source code files
 
 headers = \
-        ompi_circular_buffer_fifo.h \
-        ompi_fifo.h \
         ompi_free_list.h \
         ompi_hash_table.h \
         ompi_list.h \