diff --git a/src/mpi/info/info.h b/src/mpi/info/info.h
new file mode 100644
index 0000000000..812d44b661
--- /dev/null
+++ b/src/mpi/info/info.h
@@ -0,0 +1,17 @@
+/*
+ * $HEADER$
+ */
+
+#ifndef LAM_INFO_H
+#define LAM_INFO_H
+
+#include "mpi.h"
+
+typedef struct lam_info {
+   char i_name[MPI_MAX_OBJECT_NAME];
+
+  /* ...more stuff... */
+} lam_info_t;
+
+
+#endif /* LAM_INFO_H */
diff --git a/src/mpi/op/op.h b/src/mpi/op/op.h
new file mode 100644
index 0000000000..99d19803d7
--- /dev/null
+++ b/src/mpi/op/op.h
@@ -0,0 +1,17 @@
+/*
+ * $HEADER$
+ */
+
+#ifndef LAM_OP_H
+#define LAM_OP_H
+
+#include "mpi.h"
+
+typedef struct lam_op {
+   char o_name[MPI_MAX_OBJECT_NAME];
+
+  /* ...more stuff... */
+} lam_op_t;
+
+
+#endif /* LAM_OP_H */