From 4b25e9219499793300bb10caaed7cecf6f53b5e2 Mon Sep 17 00:00:00 2001
From: Adrian Reber <adrian@lisas.de>
Date: Wed, 25 Jun 2014 18:42:17 +0000
Subject: [PATCH] get the FT code to compile again by adding/removing #includes

This commit was SVN r32086.
---
 ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.c    | 2 ++
 orte/mca/errmgr/base/errmgr_base_tool.c | 2 ++
 orte/mca/ess/env/ess_env_module.c       | 1 -
 orte/mca/snapc/full/snapc_full_global.c | 1 -
 orte/mca/snapc/full/snapc_full_local.c  | 1 -
 5 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.c b/ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.c
index 31f9fdb79f..d41efabe9e 100644
--- a/ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.c
+++ b/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"
diff --git a/orte/mca/errmgr/base/errmgr_base_tool.c b/orte/mca/errmgr/base/errmgr_base_tool.c
index 42b2df0251..fcf9a1d48f 100644
--- a/orte/mca/errmgr/base/errmgr_base_tool.c
+++ b/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"
 
diff --git a/orte/mca/ess/env/ess_env_module.c b/orte/mca/ess/env/ess_env_module.c
index 9ccb078ea1..a0b9595743 100644
--- a/orte/mca/ess/env/ess_env_module.c
+++ b/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"
diff --git a/orte/mca/snapc/full/snapc_full_global.c b/orte/mca/snapc/full/snapc_full_global.c
index 28daf112ac..ad684cc8b7 100644
--- a/orte/mca/snapc/full/snapc_full_global.c
+++ b/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"
diff --git a/orte/mca/snapc/full/snapc_full_local.c b/orte/mca/snapc/full/snapc_full_local.c
index 68645b2683..61e7bc77f1 100644
--- a/orte/mca/snapc/full/snapc_full_local.c
+++ b/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"