diff --git a/orte/mca/ess/hnp/ess_hnp_component.c b/orte/mca/ess/hnp/ess_hnp_component.c
index a52cfb6a5f..84d8d4da19 100644
--- a/orte/mca/ess/hnp/ess_hnp_component.c
+++ b/orte/mca/ess/hnp/ess_hnp_component.c
@@ -13,6 +13,8 @@
  * Copyright (c) 2015-2017 Los Alamos National Security, LLC. All rights
  *                         reserved.
  * Copyright (c) 2017      Intel, Inc.  All rights reserved.
+ * Copyright (c) 2017      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -26,6 +28,8 @@
  * entire components just to query their version and parameters.
  */
 
+#include "opal/util/argv.h"
+
 #include "orte_config.h"
 #include "orte/constants.h"
 
diff --git a/orte/runtime/orte_finalize.c b/orte/runtime/orte_finalize.c
index 7bdd8cf8a5..4074913771 100644
--- a/orte/runtime/orte_finalize.c
+++ b/orte/runtime/orte_finalize.c
@@ -29,6 +29,7 @@
 
 #include "opal/runtime/opal.h"
 #include "opal/util/output.h"
+#include "opal/util/argv.h"
 
 #include "orte/mca/ess/ess.h"
 #include "orte/mca/ess/base/base.h"