diff --git a/src/mca/lam/oob/.cvsignore b/src/mca/lam/oob/.cvsignore
new file mode 100644
index 0000000000..3dda72986f
--- /dev/null
+++ b/src/mca/lam/oob/.cvsignore
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile
diff --git a/src/mca/lam/oob/base/.cvsignore b/src/mca/lam/oob/base/.cvsignore
new file mode 100644
index 0000000000..3dda72986f
--- /dev/null
+++ b/src/mca/lam/oob/base/.cvsignore
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile
diff --git a/src/mca/lam/oob/oob.h b/src/mca/lam/oob/oob.h
new file mode 100644
index 0000000000..35a13cbb09
--- /dev/null
+++ b/src/mca/lam/oob/oob.h
@@ -0,0 +1,45 @@
+/* -*- C -*-
+ *
+ * $HEADER$
+ */
+
+#ifndef MCA_OOB_H_
+#define MCA_OOB_H_
+
+#include "lam_config.h"
+
+#include "lam/runtime/oob.h"
+#include "mca/mca.h"
+
+typedef int (*mca_oob_query_fn_t)(int *priority);
+typedef int (*mca_oob_init_fn_t)(char* parallel_job_id, int vpid);
+typedef int (*mca_oob_send_fn_t)(char* parallel_job_id, int vpid, int tag, 
+                                 void* data, size_t data_len);
+typedef int (*mca_oob_recv_fn_t)(char* parallel_job_id, int* tag, int* vpid, 
+                                 void** data, size_t* data_len);
+typedef int (*mca_oob_recv_nb_fn_t)(char* parallel_job_id, int* tag, int* vpid, 
+                                    void** data, size_t* data_len);
+typedef int (*mca_oob_recv_cb_fn_t)(char* parallel_job_id, int tag, 
+                                    lam_oob_recv_cb_t callback);
+
+/*
+ * Ver 1.0.0
+ */
+typedef struct mca_oob_module_1_0_0 {
+  mca_1_0_0_t super;
+
+  mca_oob_query_fn_t oobm_query;
+  mca_oob_init_fn_t oobm_init;
+} mca_oob_module_1_0_0_t;
+
+typedef struct mca_oob_1_0_0 {
+  mca_oob_send_fn_t oob_send;
+  mca_oob_recv_fn_t oob_recv;
+  mca_oob_recv_nb_fn_t oob_recv_nb;
+  mca_oob_recv_cb_fn_t oob_recv_cb;
+} mca_oob_module_1_0_0_t;
+
+typedef mca_oob_module_1_0_0_t mca_oob_module_t;
+typedef mca_oob_1_0_0_t mca_oob_t;
+
+#endif
diff --git a/src/mca/lam/pcm/.cvsignore b/src/mca/lam/pcm/.cvsignore
new file mode 100644
index 0000000000..3dda72986f
--- /dev/null
+++ b/src/mca/lam/pcm/.cvsignore
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile
diff --git a/src/mca/lam/pcm/base/.cvsignore b/src/mca/lam/pcm/base/.cvsignore
new file mode 100644
index 0000000000..3dda72986f
--- /dev/null
+++ b/src/mca/lam/pcm/base/.cvsignore
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile
diff --git a/src/mca/lam/pcm/pcm.h b/src/mca/lam/pcm/pcm.h
new file mode 100644
index 0000000000..e45bbaf0a4
--- /dev/null
+++ b/src/mca/lam/pcm/pcm.h
@@ -0,0 +1,36 @@
+/* -*- C -*-
+ *
+ * $HEADER$
+ */
+
+#ifndef MCA_PCM_H_
+#define MCA_PCM_H_
+
+#include "lam_config.h"
+
+#include "mca/mca.h"
+
+typedef int (*mca_pcm_query_fn_t)(int *priority);
+typedef int (*mca_pcm_init_fn_t)(char* parallel_job_id, int vpid);
+
+
+/*
+ * Ver 1.0.0
+ */
+typedef struct mca_pcm_module_1_0_0 {
+  mca_1_0_0_t super;
+
+  mca_pcm_query_fn_t pcmm_query;
+  mca_pcm_init_fn_t pcmm_init;
+} mca_pcm_module_1_0_0_t;
+
+typedef struct mca_pcm_1_0_0 {
+  mca_pcm_publish_fn_t pcm_publish;
+  mca_pcm_lookup_fn_t pcm_lookup;
+  mca_pcm_finalize_fn_t pcm_finalize;
+} mca_pcm_module_1_0_0_t;
+
+typedef mca_pcm_module_1_0_0_t mca_pcm_module_t;
+typedef mca_pcm_1_0_0_t mca_pcm_t;
+
+#endif
diff --git a/src/mca/lam/registry/.cvsignore b/src/mca/lam/registry/.cvsignore
new file mode 100644
index 0000000000..3dda72986f
--- /dev/null
+++ b/src/mca/lam/registry/.cvsignore
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile
diff --git a/src/mca/lam/registry/base/.cvsignore b/src/mca/lam/registry/base/.cvsignore
new file mode 100644
index 0000000000..3dda72986f
--- /dev/null
+++ b/src/mca/lam/registry/base/.cvsignore
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile
diff --git a/src/mca/lam/registry/registry.h b/src/mca/lam/registry/registry.h
new file mode 100644
index 0000000000..9b017dcd7c
--- /dev/null
+++ b/src/mca/lam/registry/registry.h
@@ -0,0 +1,38 @@
+/* -*- C -*-
+ *
+ * $HEADER$
+ */
+
+#ifndef MCA_REGISTRY_H_
+#define MCA_REGISTRY_H_
+
+#include "lam_config.h"
+
+#include "mca/mca.h"
+
+typedef int (*mca_registry_query_fn_t)(int *priority);
+typedef int (*mca_registry_init_fn_t)(char* parallel_job_id, int vpid);
+typedef int (*mca_registry_publish_fn_t)(char* key, void* data, size_t data_len);
+typedef int (*mca_registry_lookup_fn_t)(char* key, void** data, size_t* data_len);
+typedef int (*mca_registry_finalize_fn_t)(void);
+
+/*
+ * Ver 1.0.0
+ */
+typedef struct mca_registry_module_1_0_0 {
+  mca_1_0_0_t super;
+
+  mca_registry_query_fn_t registry_m_query;
+  mca_registry_init_fn_t registry_m_init;
+} mca_registry_module_1_0_0_t;
+
+typedef struct mca_registry_1_0_0 {
+  mca_registry_publish_fn_t registry_publish;
+  mca_registry_lookup_fn_t registry_lookup;
+  mca_registry_finalize_fn_t registry_finalize;
+} mca_registry_module_1_0_0_t;
+
+typedef mca_registry_module_1_0_0_t mca_registry_module_t;
+typedef mca_registry_1_0_0_t mca_registry_t;
+
+#endif