get the FT code to compile again by adding/removing #includes

This commit was SVN r32086.

ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.c

@@ -24,6 +24,7 @@
 #include <unistd.h>
 #endif  /* HAVE_UNIST_H */
 
+#include "opal/dss/dss.h"
 #include "opal/runtime/opal_cr.h"
 #include "opal/mca/event/event.h"
 #include "opal/util/output.h"
@@ -42,6 +43,7 @@
 
 #include "ompi/class/ompi_free_list.h"
 #include "ompi/runtime/ompi_cr.h"
+#include "orte/runtime/orte_wait.h"
 
 #include "crcp_bkmrk.h"
 #include "crcp_bkmrk_pml.h"

orte/mca/errmgr/base/errmgr_base_tool.c

@@ -34,6 +34,8 @@
 #endif /* HAVE_DIRENT_H */
 #include <time.h>
 
+#include "opal/dss/dss.h"
+
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
 

orte/mca/ess/env/ess_env_module.c

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

orte/mca/snapc/full/snapc_full_global.c

@@ -34,7 +34,6 @@
 #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"

orte/mca/snapc/full/snapc_full_local.c

@@ -51,7 +51,6 @@
 #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"