diff --git a/include/ompi_config_bottom.h b/include/ompi_config_bottom.h
index 9e94476b38..894ed080ff 100644
--- a/include/ompi_config_bottom.h
+++ b/include/ompi_config_bottom.h
@@ -197,7 +197,8 @@ extern "C" {
 }
 #endif
 
-/* this is needed for windows ONLY. It is defined in src/win32/win_compat.h
-   if we are running on windwos, else it is defined to nothing here */
+#ifndef ompi_errno
+#define ompi_errno errno
+#endif
 
 #endif /* OMPI_CONFIG_BOTTOM_H */
diff --git a/src/mpi/runtime/ompi_mpi_init.c b/src/mpi/runtime/ompi_mpi_init.c
index 3e683e14c5..500cdd7e40 100644
--- a/src/mpi/runtime/ompi_mpi_init.c
+++ b/src/mpi/runtime/ompi_mpi_init.c
@@ -45,7 +45,7 @@
 #include "mca/gpr/base/base.h"
 
 #include "runtime/runtime.h"
-
+#include "event/event.h"
 
 /*
  * Global variables and symbols for the MPI layer