Little more cleanup from SOS

This commit was SVN r23175.

orte/mca/db/daemon/db_daemon.c

@@ -19,7 +19,7 @@
 
 #include "orte/util/show_help.h"
 #include "orte/util/name_fns.h"
-#include "orte/mca/errmgr/base/base.h"
+#include "orte/mca/errmgr/errmgr.h"
 #include "orte/mca/rmcast/rmcast.h"
 #include "orte/runtime/orte_globals.h"
 #include "orte/runtime/orte_wait.h"

orte/mca/errmgr/errmgr.h

@@ -70,6 +70,7 @@
 #include "opal/class/opal_object.h"
 #include "opal/util/output.h"
 #include "opal/util/error.h"
+#include "opal/util/opal_sos.h"
 
 #include "orte/runtime/orte_globals.h"
 #include "orte/mca/plm/plm_types.h"