diff --git a/src/lam/lfc/array.h b/src/lam/lfc/array.h
index eb86710923..f499f1c4fe 100644
--- a/src/lam/lfc/array.h
+++ b/src/lam/lfc/array.h
@@ -45,8 +45,8 @@ bool lam_arr_init_with(lam_array_t *arr, size_t length);
 
 bool lam_arr_append_item(lam_array_t *arr, lam_object_t *item);
 
-lam_object_t *lam_arr_get_item(lam_array_t *arr, int index);
-inline lam_object_t *lam_arr_get_item(lam_array_t *arr, int index)
+static inline lam_object_t *lam_arr_get_item(lam_array_t *arr, int index);
+static inline lam_object_t *lam_arr_get_item(lam_array_t *arr, int index)
 {
     if ( (index >=0) && (index < arr->arr_length) )
     {
@@ -55,8 +55,8 @@ inline lam_object_t *lam_arr_get_item(lam_array_t *arr, int index)
     return NULL;
 }
 
-size_t lam_arr_get_size(lam_array_t *arr);
-inline size_t lam_arr_get_size(lam_array_t *arr)
+static inline size_t lam_arr_get_size(lam_array_t *arr);
+static inline size_t lam_arr_get_size(lam_array_t *arr)
 {
     return arr->arr_size;
 }
@@ -73,8 +73,10 @@ void lam_arr_remove_item_matching(lam_array_t *arr, lam_object_t *item,
 
 void lam_arr_set_item(lam_array_t *arr, lam_object_t *item, int index);
 
-lam_object_t **lam_arr_get_c_array(lam_array_t *arr, size_t *size);
-inline lam_object_t **lam_arr_get_c_array(lam_array_t *arr, size_t *size)
+static inline lam_object_t **lam_arr_get_c_array(lam_array_t *arr, 
+                                                size_t *size);
+static inline lam_object_t **lam_arr_get_c_array(lam_array_t *arr, 
+                                                 size_t *size)
 {
     *size = arr->arr_size;
     return arr->arr_items;
diff --git a/src/lam/util/malloc.h b/src/lam/util/malloc.h
index f3877930fa..0a729ce4a0 100644
--- a/src/lam/util/malloc.h
+++ b/src/lam/util/malloc.h
@@ -22,8 +22,9 @@
 #define LAM_MALLOC_DEBUG_LEVEL 2
 #endif
 
-void *lam_malloc(size_t size, int debug_level, char *file, int line);
-void lam_free(void *addr, int debug_level, char *file, int line);
+static inline void *lam_malloc(size_t size, int debug_level, char *file, 
+                               int line);
+static inline void lam_free(void *addr, int debug_level, char *file, int line);
 
 /**
  * Back-end error-checking malloc function for LAM (you should use the
@@ -34,7 +35,8 @@ void lam_free(void *addr, int debug_level, char *file, int line);
  * @param file Typically the __FILE__ macro
  * @param line Typically the __LINE__ macro
  */
-inline void *lam_malloc(size_t size, int debug_level, char *file, int line)
+static inline void *lam_malloc(size_t size, int debug_level, char *file, 
+                               int line)
 {
     void *addr = NULL;
     if (debug_level > 1) {
@@ -72,7 +74,7 @@ inline void *lam_malloc(size_t size, int debug_level, char *file, int line)
  * @param file Typically the __FILE__ macro
  * @param line Typically the __LINE__ macro
  */
-inline void lam_free(void *addr, int debug_level, char *file, int line)
+static inline void lam_free(void *addr, int debug_level, char *file, int line)
 {
     if (debug_level > 1 && NULL == addr) {
 #if 0