Fix headers when building with ft enabled. Thanks to Adrian Reber for the patch!

This commit was SVN r29743.

orte/mca/ess/base/ess_base_std_app.c

@@ -53,6 +53,7 @@
 #include "orte/mca/errmgr/base/base.h"
 #if OPAL_ENABLE_FT_CR == 1
 #include "orte/mca/snapc/base/base.h"
+#include "orte/mca/sstore/base/base.h"
 #endif
 #include "orte/mca/state/base/base.h"
 #include "orte/util/proc_info.h"

orte/mca/ess/base/ess_base_std_orted.c

@@ -56,6 +56,7 @@
 #include "orte/mca/errmgr/errmgr.h"
 #if OPAL_ENABLE_FT_CR == 1
 #include "orte/mca/snapc/base/base.h"
+#include "orte/mca/sstore/base/base.h"
 #endif
 #include "orte/mca/filem/base/base.h"
 #include "orte/util/proc_info.h"

orte/mca/ess/env/ess_env_module.c

@@ -57,7 +57,7 @@
 #include "orte/mca/rmaps/base/base.h"
 #if OPAL_ENABLE_FT_CR == 1
 #include "orte/mca/snapc/base/base.h"
-#include "orte/mca/db/db.h"
+#include "opal/mca/db/db.h"
 #endif
 #include "orte/mca/filem/base/base.h"
 #include "orte/util/proc_info.h"

orte/mca/ess/hnp/ess_hnp_module.c

@@ -69,6 +69,7 @@
 #include "orte/mca/rmaps/base/base.h"
 #if OPAL_ENABLE_FT_CR == 1
 #include "orte/mca/snapc/base/base.h"
+#include "orte/mca/sstore/base/base.h"
 #endif
 #include "orte/mca/filem/base/base.h"
 #include "orte/mca/state/base/base.h"

orte/mca/rml/oob/rml_oob_component.c

@@ -39,6 +39,9 @@
 #include "opal/mca/backtrace/backtrace.h"
 #include "opal/mca/event/event.h"
 
+#if OPAL_ENABLE_FT_CR == 1
+#include "orte/mca/rml/rml.h"
+#endif
 #include "orte/mca/rml/base/base.h"
 #include "orte/mca/rml/rml_types.h"
 #include "orte/mca/routed/routed.h"

orte/mca/snapc/full/snapc_full_global.c

@@ -34,6 +34,7 @@
 #include "opal/mca/base/base.h"
 #include "opal/mca/crs/crs.h"
 #include "opal/mca/crs/base/base.h"
+#include "opal/mca/db/db.h"
 
 #include "orte/util/name_fns.h"
 #include "orte/util/proc_info.h"
@@ -45,7 +46,6 @@
 #include "orte/mca/rmaps/rmaps_types.h"
 #include "orte/mca/plm/plm.h"
 #include "orte/mca/grpcomm/grpcomm.h"
-#include "orte/mca/db/db.h"
 #include "orte/runtime/orte_wait.h"
 #include "orte/mca/errmgr/errmgr.h"
 #include "orte/mca/errmgr/base/base.h"

orte/mca/snapc/full/snapc_full_local.c

@@ -51,6 +51,7 @@
 #include "opal/mca/base/base.h"
 #include "opal/mca/crs/crs.h"
 #include "opal/mca/crs/base/base.h"
+#include "opal/mca/db/db.h"
 
 #include "orte/util/show_help.h"
 #include "orte/util/name_fns.h"
@@ -63,7 +64,6 @@
 #include "orte/mca/errmgr/errmgr.h"
 #include "orte/mca/routed/routed.h"
 #include "orte/mca/grpcomm/grpcomm.h"
-#include "orte/mca/db/db.h"
 
 #include "orte/mca/snapc/snapc.h"
 #include "orte/mca/snapc/base/base.h"

orte/mca/sstore/stage/sstore_stage_app.c

@@ -47,6 +47,7 @@
 #include "orte/runtime/orte_globals.h"
 #include "orte/runtime/orte_wait.h"
 #include "orte/mca/errmgr/errmgr.h"
+#include "orte/mca/rml/rml.h"
 #include "orte/mca/rml/rml_types.h"
 
 #include "orte/mca/sstore/sstore.h"

orte/mca/sstore/stage/sstore_stage_component.c

@@ -10,6 +10,7 @@
 
 #include "orte_config.h"
 #include "opal/util/output.h"
+#include "opal/util/opal_environ.h"
 #include "orte/constants.h"
 
 #include "orte/mca/sstore/sstore.h"