diff --git a/src/mca/base/base.h b/src/mca/base/base.h
index bebbb4ad90..5aa57d919c 100644
--- a/src/mca/base/base.h
+++ b/src/mca/base/base.h
@@ -5,7 +5,7 @@
 #ifndef MCA_BASE_H
 #define MCA_BASE_H
 
-#include "mca/ltdl.h"
+#include "libltdl/ltdl.h"
 
 /*
  * These units are large enough to warrant their own .h files
diff --git a/src/mca/base/mca_base_module_find.c b/src/mca/base/mca_base_module_find.c
index 3b0560095c..42053e5eb7 100644
--- a/src/mca/base/mca_base_module_find.c
+++ b/src/mca/base/mca_base_module_find.c
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 
 /* Ensure to get the right <ltdl.h> */ 
-#include "mca/ltdl.h"
+#include "libltdl/ltdl.h"
 
 #include "constants.h"
 #include "util/output.h"
diff --git a/src/mca/base/mca_base_module_registry.c b/src/mca/base/mca_base_module_registry.c
index 894049d3d3..1167d627d8 100644
--- a/src/mca/base/mca_base_module_registry.c
+++ b/src/mca/base/mca_base_module_registry.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 
 /* Ensure to get the right <ltdl.h> */ 
-#include "mca/ltdl.h"
+#include "libltdl/ltdl.h"
 
 #include "constants.h"
 #include "lfc/lam_list.h"
diff --git a/src/types.h b/src/types.h
index 8f3c6ceec4..80d141147e 100644
--- a/src/types.h
+++ b/src/types.h
@@ -20,6 +20,7 @@
 #endif
 
 struct lam_fd_set_t {
+  int i;
     uint32_t fds_bits[LAM_FD_SETSIZE / NFDBITS];
 };
 typedef struct lam_fd_set_t lam_fd_set_t;