diff --git a/src/mca/lam/base/Makefile.am b/src/mca/lam/base/Makefile.am
index 201b561781..89a52cb890 100644
--- a/src/mca/lam/base/Makefile.am
+++ b/src/mca/lam/base/Makefile.am
@@ -9,7 +9,7 @@ noinst_LTLIBRARIES = libmca_lam_base.la
 # Source code files
 
 headers = \
-        param.h \
+        mca_lam_param.h \
         module_exchange.h
 
 # Library
diff --git a/src/mca/lam/base/mca_lam_param.c b/src/mca/lam/base/mca_lam_param.c
index 01dad0a4f5..7811eedead 100644
--- a/src/mca/lam/base/mca_lam_param.c
+++ b/src/mca/lam/base/mca_lam_param.c
@@ -2,6 +2,8 @@
  * $HEADER$
  */
 
+/** @file **/
+
 #include "lam_config.h"
 
 #include <stdio.h>
@@ -12,22 +14,37 @@
 #include "lam/lfc/array.h"
 #include "lam/mem/malloc.h"
 #include "mca/mca.h"
-#include "mca/lam/base/param.h"
+#include "mca/lam/base/mca_lam_param.h"
 
-/** @file **/
 
-/*
- * public variables
- */
-/** 
- * @internal 
- */
-lam_array_t mca_base_params;
+typedef enum {
+  MCA_BASE_PARAM_TYPE_INT,
+  MCA_BASE_PARAM_TYPE_STRING,
+
+  MCA_BASE_PARAM_TYPE_MAX
+} mca_base_param_type_t;
+
+struct mca_base_param_t {
+  lam_array_item_t super;
+
+  mca_base_param_type_t mbp_type;
+  char *mbp_type_name;
+  char *mbp_module_name;
+  char *mbp_param_name;
+  char *mbp_full_name;
+
+  int mbp_keyval;
+  char *mbp_env_var_name;
+
+  mca_base_param_storage_t mbp_default_value;
+};
+typedef struct mca_base_param_t mca_base_param_t;
 
 
 /*
  * local variables
  */
+static lam_array_t mca_base_params;
 static char *mca_prefix = "LAM_MPI_MCA_";
 static bool initialized = false;
 
diff --git a/src/mca/lam/base/mca_lam_param.h b/src/mca/lam/base/mca_lam_param.h
index ad15cd10d8..1352987c31 100644
--- a/src/mca/lam/base/mca_lam_param.h
+++ b/src/mca/lam/base/mca_lam_param.h
@@ -14,13 +14,6 @@
  * Types for MCA parameters
  */
 
-typedef enum {
-  MCA_BASE_PARAM_TYPE_INT,
-  MCA_BASE_PARAM_TYPE_STRING,
-
-  MCA_BASE_PARAM_TYPE_MAX
-} mca_base_param_type_t;
-
 typedef union {
   int intval;
   char *stringval;
@@ -28,29 +21,6 @@ typedef union {
 
 #define MCA_BASE_PARAM_INFO ((void*) -1)
 
-struct mca_base_param_t {
-  lam_array_item_t super;
-
-  mca_base_param_type_t mbp_type;
-  char *mbp_type_name;
-  char *mbp_module_name;
-  char *mbp_param_name;
-  char *mbp_full_name;
-
-  int mbp_keyval;
-  char *mbp_env_var_name;
-
-  mca_base_param_storage_t mbp_default_value;
-};
-typedef struct mca_base_param_t mca_base_param_t;
-
-
-/*
- * Variable holding the array of registered MCA parameters
- */
-
-extern lam_array_t mca_base_params;
-
 
 /*
  * Global functions for MCA
@@ -59,16 +29,20 @@ extern lam_array_t mca_base_params;
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {
 #endif
-  int mca_base_param_register_int(const char *type_name, const char *module_name,
-                                  const char *param_name, const char *mca_param_name,
+  int mca_base_param_register_int(const char *type_name, 
+                                  const char *module_name,
+                                  const char *param_name, 
+                                  const char *mca_param_name,
                                   int default_value);
-  int mca_base_param_register_string(const char *type_name, const char *module_name,
+  int mca_base_param_register_string(const char *type_name, 
+                                     const char *module_name,
                                      const char *param_name, 
                                      const char *mca_param_name,
                                      const char *default_value);
   int mca_base_param_lookup_int(int index, int *value);
   int mca_base_param_lookup_string(int index, char **value);
-  int mca_base_param_find(const char *type, const char *module, const char *param);
+  int mca_base_param_find(const char *type, const char *module, 
+                          const char *param);
   int mca_base_param_finalize(void);
 
 #if 0