-#include "private.h"
-
-
-typedef struct s_smpi_mpi_comm_key_elem {
- MPI_Comm_copy_attr_function* copy_fn;
- MPI_Comm_delete_attr_function* delete_fn;
-} s_smpi_mpi_comm_key_elem_t;
-typedef struct s_smpi_mpi_comm_key_elem *smpi_comm_key_elem;
+#include <list>
+#include "src/smpi/smpi_keyvals.hpp"
+#include "src/smpi/smpi_group.hpp"
+#include "src/smpi/smpi_topo.hpp"