diff --git a/opal/class/ompi_bitmap.c b/ompi/class/ompi_bitmap.c
similarity index 100%
rename from opal/class/ompi_bitmap.c
rename to ompi/class/ompi_bitmap.c
diff --git a/opal/class/ompi_bitmap.h b/ompi/class/ompi_bitmap.h
similarity index 100%
rename from opal/class/ompi_bitmap.h
rename to ompi/class/ompi_bitmap.h
diff --git a/opal/class/ompi_pointer_array.c b/ompi/class/ompi_pointer_array.c
similarity index 100%
rename from opal/class/ompi_pointer_array.c
rename to ompi/class/ompi_pointer_array.c
diff --git a/opal/class/ompi_pointer_array.h b/ompi/class/ompi_pointer_array.h
similarity index 100%
rename from opal/class/ompi_pointer_array.h
rename to ompi/class/ompi_pointer_array.h