diff --git a/ompi/communicator/comm.c b/ompi/communicator/comm.c
index 7126ca486b9..1ee342ffadf 100644
--- a/ompi/communicator/comm.c
+++ b/ompi/communicator/comm.c
@@ -18,7 +18,7 @@
  * Copyright (c) 2012      Oak Ridge National Labs.  All rights reserved.
  * Copyright (c) 2012-2016 Los Alamos National Security, LLC.
  *                         All rights reserved.
- * Copyright (c) 2014-2016 Research Organization for Information Science
+ * Copyright (c) 2014-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
  * Copyright (c) 2015      Mellanox Technologies. All rights reserved.
@@ -34,7 +34,7 @@
 #include <stdio.h>
 
 #include "ompi/constants.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/dss/dss.h"
 #include "opal/mca/pmix/pmix.h"
 
diff --git a/ompi/dpm/dpm.c b/ompi/dpm/dpm.c
index 8d472d67351..151377e5a46 100644
--- a/ompi/dpm/dpm.c
+++ b/ompi/dpm/dpm.c
@@ -41,7 +41,7 @@
 #include "opal/util/opal_getcwd.h"
 #include "opal/util/proc.h"
 #include "opal/dss/dss.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/mca/pmix/pmix.h"
 
 #include "ompi/communicator/communicator.h"
diff --git a/ompi/mca/coll/sm/coll_sm_module.c b/ompi/mca/coll/sm/coll_sm_module.c
index 4739217bc15..c993792d546 100644
--- a/ompi/mca/coll/sm/coll_sm_module.c
+++ b/ompi/mca/coll/sm/coll_sm_module.c
@@ -13,7 +13,7 @@
  * Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2010-2012 Los Alamos National Security, LLC.
  *                         All rights reserved.
- * Copyright (c) 2014-2015 Research Organization for Information Science
+ * Copyright (c) 2014-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2015      Intel, Inc. All rights reserved.
  * $COPYRIGHT$
@@ -49,7 +49,7 @@
 
 #include "mpi.h"
 #include "opal_stdint.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/util/os_path.h"
 
 #include "ompi/communicator/communicator.h"
diff --git a/ompi/mca/topo/treematch/configure.m4 b/ompi/mca/topo/treematch/configure.m4
index c937df36114..97b07ad9aab 100644
--- a/ompi/mca/topo/treematch/configure.m4
+++ b/ompi/mca/topo/treematch/configure.m4
@@ -6,7 +6,9 @@
 # Copyright (c) 2011-2015 INRIA.  All rights reserved.
 # Copyright (c) 2011-2015 Universite Bordeaux 1
 # Copyright (c) 2015      Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2015       Intel, Inc. All rights reserved.
+# Copyright (c) 2015      Intel, Inc. All rights reserved.
+# Copyright (c) 2017      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -18,7 +20,7 @@
 #                                [action-if-cant-compile])
 # -------------------------------------------
 AC_DEFUN([MCA_ompi_topo_treematch_CONFIG], [
-    AC_REQUIRE([MCA_opal_hwloc_CONFIG_REQUIRE])
+    AC_REQUIRE([MCA_opal_hwlocxxx_CONFIG_REQUIRE])
 
     AC_ARG_WITH([treematch],
           [AC_HELP_STRING([--with-treematch(=DIR)],
diff --git a/ompi/mca/topo/treematch/topo_treematch_dist_graph_create.c b/ompi/mca/topo/treematch/topo_treematch_dist_graph_create.c
index 8026d50b630..a221023fed2 100644
--- a/ompi/mca/topo/treematch/topo_treematch_dist_graph_create.c
+++ b/ompi/mca/topo/treematch/topo_treematch_dist_graph_create.c
@@ -6,7 +6,7 @@
  * Copyright (c) 2011-2015 INRIA.  All rights reserved.
  * Copyright (c) 2012-2015 Bordeaux Poytechnic Institute
  * Copyright (c) 2015-2016 Intel, Inc.  All rights reserved.
- * Copyright (c) 2015-2016 Research Organization for Information Science
+ * Copyright (c) 2015-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2016      Los Alamos National Security, LLC. All rights
  *                         reserved.
@@ -20,7 +20,7 @@
 #include "ompi_config.h"
 
 #include "opal/constants.h"
-#include "opal/mca/hwloc/hwloc.h"
+#include "opal/mca/hwlocxxx/hwlocxxx.h"
 
 #include "ompi/mca/topo/treematch/topo_treematch.h"
 #include "ompi/mca/topo/treematch/treematch/tm_mapping.h"
diff --git a/ompi/mpiext/affinity/c/mpiext_affinity_str.c b/ompi/mpiext/affinity/c/mpiext_affinity_str.c
index bc6412da665..2fbbbc26d26 100644
--- a/ompi/mpiext/affinity/c/mpiext_affinity_str.c
+++ b/ompi/mpiext/affinity/c/mpiext_affinity_str.c
@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/runtime/opal.h"
 
 #include "ompi/communicator/communicator.h"
diff --git a/ompi/proc/proc.c b/ompi/proc/proc.c
index a5d77c6586c..aac0205f904 100644
--- a/ompi/proc/proc.c
+++ b/ompi/proc/proc.c
@@ -36,7 +36,7 @@
 #include "opal/dss/dss.h"
 #include "opal/util/arch.h"
 #include "opal/util/show_help.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/mca/pmix/pmix.h"
 
 #include "ompi/proc/proc.h"
diff --git a/ompi/runtime/ompi_mpi_init.c b/ompi/runtime/ompi_mpi_init.c
index 34616380f36..541e5170cc5 100644
--- a/ompi/runtime/ompi_mpi_init.c
+++ b/ompi/runtime/ompi_mpi_init.c
@@ -18,7 +18,7 @@
  * Copyright (c) 2011      Sandia National Laboratories. All rights reserved.
  * Copyright (c) 2012-2013 Inria.  All rights reserved.
  * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
- * Copyright (c) 2014-2016 Research Organization for Information Science
+ * Copyright (c) 2014-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2016      Mellanox Technologies Ltd. All rights reserved.
  *
@@ -42,7 +42,7 @@
 #include "mpi.h"
 #include "opal/class/opal_list.h"
 #include "opal/mca/base/base.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/runtime/opal_progress.h"
 #include "opal/threads/threads.h"
 #include "opal/util/arch.h"
diff --git a/opal/mca/btl/openib/btl_openib.c b/opal/mca/btl/openib/btl_openib.c
index 20585e62f5d..1438cb0c9e5 100644
--- a/opal/mca/btl/openib/btl_openib.c
+++ b/opal/mca/btl/openib/btl_openib.c
@@ -19,7 +19,7 @@
  * Copyright (c) 2009      IBM Corporation.  All rights reserved.
  * Copyright (c) 2013-2015 Intel, Inc. All rights reserved
  * Copyright (c) 2013-2015 NVIDIA Corporation.  All rights reserved.
- * Copyright (c) 2014-2015 Research Organization for Information Science
+ * Copyright (c) 2014-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2014      Bull SAS.  All rights reserved
  * $COPYRIGHT$
@@ -84,7 +84,7 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include "opal/mca/hwloc/hwloc.h"
+#include "opal/mca/hwlocxxx/hwlocxxx.h"
 
 #ifndef MIN
 #define MIN(a,b) ((a)<(b)?(a):(b))
diff --git a/opal/mca/btl/openib/btl_openib_component.c b/opal/mca/btl/openib/btl_openib_component.c
index ff3892fdb92..76458a379f8 100644
--- a/opal/mca/btl/openib/btl_openib_component.c
+++ b/opal/mca/btl/openib/btl_openib_component.c
@@ -19,7 +19,7 @@
  * Copyright (c) 2011-2015 NVIDIA Corporation.  All rights reserved.
  * Copyright (c) 2012      Oak Ridge National Laboratory.  All rights reserved
  * Copyright (c) 2013-2016 Intel, Inc.  All rights reserved.
- * Copyright (c) 2014-2016 Research Organization for Information Science
+ * Copyright (c) 2014-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2014      Bull SAS.  All rights reserved.
  * $COPYRIGHT$
@@ -53,14 +53,14 @@
 #include "opal/util/sys_limits.h"
 #include "opal/util/argv.h"
 #include "opal/memoryhooks/memory.h"
-/* Define this before including hwloc.h so that we also get the hwloc
+/* Define this before including hwlocxxx.h so that we also get the hwlocxxx
    verbs helper header file, too.  We have to do this level of
-   indirection because the hwloc subsystem is a component -- we don't
+   indirection because the hwlocxxx subsystem is a component -- we don't
    know its exact path.  We have to rely on the framework header files
-   to find the right hwloc verbs helper file for us. */
+   to find the right hwlocxxx verbs helper file for us. */
 #define OPAL_HWLOC_WANT_VERBS_HELPER 1
-#include "opal/mca/hwloc/hwloc.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/hwlocxxx.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/mca/installdirs/installdirs.h"
 #include "opal_stdint.h"
 #include "opal/util/show_help.h"
diff --git a/opal/mca/btl/sm/btl_sm.c b/opal/mca/btl/sm/btl_sm.c
index d9078f5bc74..e8be0fb81c6 100644
--- a/opal/mca/btl/sm/btl_sm.c
+++ b/opal/mca/btl/sm/btl_sm.c
@@ -51,7 +51,7 @@
 #include "opal/util/output.h"
 #include "opal/util/show_help.h"
 #include "opal/util/printf.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/mca/pmix/base/base.h"
 #include "opal/mca/shmem/base/base.h"
 #include "opal/mca/shmem/shmem.h"
diff --git a/opal/mca/btl/smcuda/btl_smcuda.c b/opal/mca/btl/smcuda/btl_smcuda.c
index 5f10ccd560b..49132ec0bf3 100644
--- a/opal/mca/btl/smcuda/btl_smcuda.c
+++ b/opal/mca/btl/smcuda/btl_smcuda.c
@@ -16,7 +16,7 @@
  *                         reserved.
  * Copyright (c) 2012-2015 NVIDIA Corporation.  All rights reserved.
  * Copyright (c) 2012      Oracle and/or its affiliates.  All rights reserved.
- * Copyright (c) 2014      Research Organization for Information Science
+ * Copyright (c) 2014 -2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2015-2016 Intel, Inc.  All rights reserved.
  * $COPYRIGHT$
@@ -47,7 +47,7 @@
 #include "opal/util/output.h"
 #include "opal/util/show_help.h"
 #include "opal/util/printf.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/mca/pmix/base/base.h"
 #include "opal/mca/shmem/base/base.h"
 #include "opal/mca/shmem/shmem.h"
diff --git a/opal/mca/btl/usnic/btl_usnic_hwloc.c b/opal/mca/btl/usnic/btl_usnic_hwloc.c
index e0230f02c9c..330faf5fea3 100644
--- a/opal/mca/btl/usnic/btl_usnic_hwloc.c
+++ b/opal/mca/btl/usnic/btl_usnic_hwloc.c
@@ -1,6 +1,8 @@
 /*
  * Copyright (c) 2013-2016 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2016      Intel, Inc.  All rights reserved.
+ * Copyright (c) 2017      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -10,7 +12,7 @@
 
 #include "opal_config.h"
 
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/constants.h"
 
 #if BTL_IN_OPAL
diff --git a/opal/mca/common/sm/common_sm_mpool.c b/opal/mca/common/sm/common_sm_mpool.c
index be59ec1d641..12fd3ca45c5 100644
--- a/opal/mca/common/sm/common_sm_mpool.c
+++ b/opal/mca/common/sm/common_sm_mpool.c
@@ -14,6 +14,8 @@
  *                         All rights reserved.
  * Copyright (c) 2011-2014 NVIDIA Corporation.  All rights reserved.
  * Copyright (c) 2015      Intel, Inc. All rights reserved
+ * Copyright (c) 2017      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -30,7 +32,7 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 
 #if OPAL_ENABLE_FT_CR    == 1
 #include "orte/mca/sstore/sstore.h"
diff --git a/opal/mca/hwloc/hwloc1113/configure.m4 b/opal/mca/hwloc/hwloc1113/configure.m4
deleted file mode 100644
index f1583b862c8..00000000000
--- a/opal/mca/hwloc/hwloc1113/configure.m4
+++ /dev/null
@@ -1,187 +0,0 @@
-# -*- shell-script -*-
-#
-# Copyright (c) 2009-2015 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
-# Copyright (c) 2015-2016 Research Organization for Information Science
-#                         and Technology (RIST). All rights reserved.
-# Copyright (c) 2016      Los Alamos National Security, LLC. All rights
-#                         reserved.
-#
-# $COPYRIGHT$
-#
-# Additional copyrights may follow
-#
-# $HEADER$
-#
-
-#
-# Priority
-#
-AC_DEFUN([MCA_opal_hwloc_hwloc1113_PRIORITY], [90])
-
-#
-# Force this component to compile in static-only mode
-#
-AC_DEFUN([MCA_opal_hwloc_hwloc1113_COMPILE_MODE], [
-    AC_MSG_CHECKING([for MCA component $2:$3 compile mode])
-    $4="static"
-    AC_MSG_RESULT([$$4])
-])
-
-# Include hwloc m4 files
-m4_include(opal/mca/hwloc/hwloc1113/hwloc/config/hwloc.m4)
-m4_include(opal/mca/hwloc/hwloc1113/hwloc/config/hwloc_pkg.m4)
-m4_include(opal/mca/hwloc/hwloc1113/hwloc/config/hwloc_check_attributes.m4)
-m4_include(opal/mca/hwloc/hwloc1113/hwloc/config/hwloc_check_visibility.m4)
-m4_include(opal/mca/hwloc/hwloc1113/hwloc/config/hwloc_check_vendor.m4)
-m4_include(opal/mca/hwloc/hwloc1113/hwloc/config/hwloc_components.m4)
-
-# MCA_hwloc_hwloc1113_POST_CONFIG()
-# ---------------------------------
-AC_DEFUN([MCA_opal_hwloc_hwloc1113_POST_CONFIG],[
-    OPAL_VAR_SCOPE_PUSH([opal_hwloc_hwloc1113_basedir])
-
-    # If we won, then do all the rest of the setup
-    AS_IF([test "$1" = "1" && test "$opal_hwloc_hwloc1113_support" = "yes"],
-          [
-           # Set this variable so that the framework m4 knows what
-           # file to include in opal/mca/hwloc/hwloc.h
-           opal_hwloc_hwloc1113_basedir=opal/mca/hwloc/hwloc1113
-           opal_hwloc_base_include="$opal_hwloc_hwloc1113_basedir/hwloc1113.h"
-
-           # Add some stuff to CPPFLAGS so that the rest of the source
-           # tree can be built
-           file=$opal_hwloc_hwloc1113_basedir/hwloc
-           CPPFLAGS="-I$OPAL_TOP_SRCDIR/$file/include $CPPFLAGS"
-           AS_IF([test "$OPAL_TOP_BUILDDIR" != "$OPAL_TOP_SRCDIR"],
-                 [CPPFLAGS="-I$OPAL_TOP_BUILDDIR/$file/include $CPPFLAGS"])
-           unset file
-          ])
-    OPAL_VAR_SCOPE_POP
-
-    # This must be run unconditionally
-    HWLOC_DO_AM_CONDITIONALS
-])dnl
-
-
-# MCA_hwloc_hwloc1113_CONFIG([action-if-found], [action-if-not-found])
-# --------------------------------------------------------------------
-AC_DEFUN([MCA_opal_hwloc_hwloc1113_CONFIG],[
-    # Hwloc needs to know if we have Verbs support
-    AC_REQUIRE([OPAL_CHECK_VERBS_DIR])
-
-    AC_CONFIG_FILES([opal/mca/hwloc/hwloc1113/Makefile])
-
-    OPAL_VAR_SCOPE_PUSH([HWLOC_VERSION opal_hwloc_hwloc1113_save_CPPFLAGS opal_hwloc_hwloc1113_save_LDFLAGS opal_hwloc_hwloc1113_save_LIBS opal_hwloc_hwloc1113_save_cairo opal_hwloc_hwloc1113_save_xml opal_hwloc_hwloc1113_basedir opal_hwloc_hwloc1113_file opal_hwloc_hwloc1113_save_cflags CPPFLAGS_save LIBS_save opal_hwloc_external])
-
-    # default to this component not providing support
-    opal_hwloc_hwloc1113_basedir=opal/mca/hwloc/hwloc1113
-    opal_hwloc_hwloc1113_support=no
-
-    AS_IF([test "$with_hwloc" = "internal" || test -z "$with_hwloc" || test "$with_hwloc" = "yes"],
-          [opal_hwloc_external="no"],
-          [opal_hwloc_external="yes"])
-
-    opal_hwloc_hwloc1113_save_CPPFLAGS=$CPPFLAGS
-    opal_hwloc_hwloc1113_save_LDFLAGS=$LDFLAGS
-    opal_hwloc_hwloc1113_save_LIBS=$LIBS
-
-    # Run the hwloc configuration - if no external hwloc, then set the prefixi
-    # to minimize the chance that someone will use the internal symbols
-    AS_IF([test "$opal_hwloc_external" = "no"],
-          [HWLOC_SET_SYMBOL_PREFIX([opal_hwloc1113_])])
-
-    # save XML or graphical options
-    opal_hwloc_hwloc1113_save_cairo=$enable_cairo
-    opal_hwloc_hwloc1113_save_xml=$enable_xml
-    opal_hwloc_hwloc1113_save_static=$enable_static
-    opal_hwloc_hwloc1113_save_shared=$enable_shared
-    opal_hwloc_hwloc1113_save_plugins=$enable_plugins
-
-    # never enable hwloc's graphical option
-    enable_cairo=no
-
-    # never enable hwloc's plugin system
-    enable_plugins=no
-    enable_static=yes
-    enable_shared=no
-
-    # Override -- disable hwloc's libxml2 support, but enable the
-    # native hwloc XML support
-    enable_libxml2=no
-    enable_xml=yes
-
-    # hwloc checks for compiler visibility, and its needs to do
-    # this without "picky" flags.
-    opal_hwloc_hwloc1113_save_cflags=$CFLAGS
-    CFLAGS=$OPAL_CFLAGS_BEFORE_PICKY
-    HWLOC_SETUP_CORE([opal/mca/hwloc/hwloc1113/hwloc],
-              [AC_MSG_CHECKING([whether hwloc configure succeeded])
-               AC_MSG_RESULT([yes])
-               HWLOC_VERSION="internal v`$srcdir/$opal_hwloc_hwloc1113_basedir/hwloc/config/hwloc_get_version.sh $srcdir/$opal_hwloc_hwloc1113_basedir/hwloc/VERSION`"
-
-               # Build flags for our Makefile.am
-               opal_hwloc_hwloc1113_LDFLAGS='$(HWLOC_EMBEDDED_LDFLAGS)'
-               opal_hwloc_hwloc1113_LIBS='$(OPAL_TOP_BUILDDIR)/'"$opal_hwloc_hwloc1113_basedir"'/hwloc/src/libhwloc_embedded.la $(HWLOC_EMBEDDED_LIBS)'
-               opal_hwloc_hwloc1113_support=yes
-
-               AC_DEFINE_UNQUOTED([HWLOC_HWLOC1113_HWLOC_VERSION],
-                   ["$HWLOC_VERSION"],
-                   [Version of hwloc])
-
-               # Do we have verbs support?
-               CPPFLAGS_save=$CPPFLAGS
-               AS_IF([test "$opal_want_verbs" = "yes"],
-                     [CPPFLAGS="-I$opal_verbs_dir/include $CPPFLAGS"])
-               AC_CHECK_HEADERS([infiniband/verbs.h])
-               CPPFLAGS=$CPPFLAGS_save
-              ],
-              [AC_MSG_CHECKING([whether hwloc configure succeeded])
-               AC_MSG_RESULT([no])
-               opal_hwloc_hwloc1113_support=no])
-    CFLAGS=$opal_hwloc_hwloc1113_save_cflags
-
-    # Restore some env variables, if necessary
-    AS_IF([test -n "$opal_hwloc_hwloc1113_save_cairo"],
-          [enable_cairo=$opal_hwloc_hwloc1113_save_cairo])
-    AS_IF([test -n "$opal_hwloc_hwloc1113_save_xml"],
-          [enable_xml=$opal_hwloc_hwloc1113_save_xml])
-    AS_IF([test -n "$opal_hwloc_hwloc1113_save_static"],
-          [enable_static=$opal_hwloc_hwloc1113_save_static])
-    AS_IF([test -n "$opal_hwloc_hwloc1113_save_shared"],
-          [enable_shared=$opal_hwloc_hwloc1113_save_shared])
-    AS_IF([test -n "$opal_hwloc_hwloc1113_save_plugins"],
-          [enable_plugins=$opal_hwloc_hwloc1113_save_shared])
-
-    CPPFLAGS=$opal_hwloc_hwloc1113_save_CPPFLAGS
-    LDFLAGS=$opal_hwloc_hwloc1113_save_LDFLAGS
-    LIBS=$opal_hwloc_hwloc1113_save_LIBS
-
-    AC_SUBST([opal_hwloc_hwloc1113_CFLAGS])
-    AC_SUBST([opal_hwloc_hwloc1113_CPPFLAGS])
-    AC_SUBST([opal_hwloc_hwloc1113_LDFLAGS])
-    AC_SUBST([opal_hwloc_hwloc1113_LIBS])
-
-    # Finally, add some flags to the wrapper compiler so that our
-    # headers can be found.
-    hwloc_hwloc1113_WRAPPER_EXTRA_LDFLAGS="$HWLOC_EMBEDDED_LDFLAGS"
-    hwloc_hwloc1113_WRAPPER_EXTRA_LIBS="$HWLOC_EMBEDDED_LIBS"
-    hwloc_hwloc1113_WRAPPER_EXTRA_CPPFLAGS='-I${pkgincludedir}/'"$opal_hwloc_hwloc1113_basedir/hwloc/include"
-
-    # If we are not building the internal hwloc, then indicate that
-    # this component should not be built.  NOTE: we still did all the
-    # above configury so that all the proper GNU Autotools
-    # infrastructure is setup properly (e.g., w.r.t. SUBDIRS=hwloc in
-    # this directory's Makefile.am, we still need the Autotools "make
-    # distclean" infrastructure to work properly).
-    AS_IF([test "$opal_hwloc_external" = "yes"],
-          [AC_MSG_WARN([using an external hwloc; disqualifying this component])
-           opal_hwloc_hwloc1113_support=no])
-
-    # Done!
-    AS_IF([test "$opal_hwloc_hwloc1113_support" = "yes"],
-          [$1],
-          [$2])
-
-    OPAL_VAR_SCOPE_POP
-])dnl
diff --git a/opal/mca/hwloc/Makefile.am b/opal/mca/hwlocxxx/Makefile.am
similarity index 52%
rename from opal/mca/hwloc/Makefile.am
rename to opal/mca/hwlocxxx/Makefile.am
index c5340da386d..c997b5a9ff6 100644
--- a/opal/mca/hwloc/Makefile.am
+++ b/opal/mca/hwlocxxx/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Copyright (c) 2011-2016 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2016      Research Organization for Information Science
+# Copyright (c) 2016 -2017 Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
 # $COPYRIGHT$
 #
@@ -9,18 +9,13 @@
 # $HEADER$
 #
 
-# We do not want -I$(srcdir) in AM_CPPFLAGS, or there can be a
-# conflict between system hwloc.h and opal/mca/hwloc/hwloc.h.  So just
-# set only what we need to AM_CPPFLAGS.
-AM_CPPFLAGS = -I$(top_builddir)/opal/include
-
 # main library setup
-noinst_LTLIBRARIES = libmca_hwloc.la
-libmca_hwloc_la_SOURCES =
+noinst_LTLIBRARIES = libmca_hwlocxxx.la
+libmca_hwlocxxx_la_SOURCES =
 
 # local files
-headers = hwloc.h
-libmca_hwloc_la_SOURCES += $(headers)
+headers = hwlocxxx.h
+libmca_hwlocxxx_la_SOURCES += $(headers)
 
 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
diff --git a/opal/mca/hwloc/README.txt b/opal/mca/hwlocxxx/README.txt
similarity index 100%
rename from opal/mca/hwloc/README.txt
rename to opal/mca/hwlocxxx/README.txt
diff --git a/opal/mca/hwloc/base/Makefile.am b/opal/mca/hwlocxxx/base/Makefile.am
similarity index 70%
rename from opal/mca/hwloc/base/Makefile.am
rename to opal/mca/hwlocxxx/base/Makefile.am
index f5ae3d0445a..4dace84f4c3 100644
--- a/opal/mca/hwloc/base/Makefile.am
+++ b/opal/mca/hwlocxxx/base/Makefile.am
@@ -1,6 +1,8 @@
 #
 # Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2015      Intel, Inc. All rights reserved.
+# Copyright (c) 2017      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -13,7 +15,7 @@ dist_opaldata_DATA = base/help-opal-hwloc-base.txt
 headers += \
         base/base.h
 
-libmca_hwloc_la_SOURCES += \
+libmca_hwlocxxx_la_SOURCES += \
         base/hwloc_base_frame.c \
         base/hwloc_base_dt.c \
         base/hwloc_base_util.c \
diff --git a/opal/mca/hwloc/base/base.h b/opal/mca/hwlocxxx/base/base.h
similarity index 97%
rename from opal/mca/hwloc/base/base.h
rename to opal/mca/hwlocxxx/base/base.h
index 8dfbd901bb6..c6b0cf2145b 100644
--- a/opal/mca/hwloc/base/base.h
+++ b/opal/mca/hwlocxxx/base/base.h
@@ -1,6 +1,8 @@
 /*
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2013-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
@@ -15,7 +17,7 @@
 
 #include "opal/dss/dss_types.h"
 
-#include "opal/mca/hwloc/hwloc.h"
+#include "opal/mca/hwlocxxx/hwlocxxx.h"
 
 /*
  * Global functions for MCA overall hwloc open and close
@@ -44,7 +46,7 @@ BEGIN_C_DECLS
 OPAL_DECLSPEC extern bool opal_hwloc_base_inited;
 OPAL_DECLSPEC extern bool opal_hwloc_topology_inited;
 
-OPAL_DECLSPEC extern mca_base_framework_t opal_hwloc_base_framework;
+OPAL_DECLSPEC extern mca_base_framework_t opal_hwlocxxx_base_framework;
 
 /* we always must have some minimal locality support */
 #define OPAL_HWLOC_PRINT_MAX_SIZE   50
diff --git a/opal/mca/hwloc/base/help-opal-hwloc-base.txt b/opal/mca/hwlocxxx/base/help-opal-hwloc-base.txt
similarity index 100%
rename from opal/mca/hwloc/base/help-opal-hwloc-base.txt
rename to opal/mca/hwlocxxx/base/help-opal-hwloc-base.txt
diff --git a/opal/mca/hwloc/base/hwloc_base_dt.c b/opal/mca/hwlocxxx/base/hwloc_base_dt.c
similarity index 97%
rename from opal/mca/hwloc/base/hwloc_base_dt.c
rename to opal/mca/hwlocxxx/base/hwloc_base_dt.c
index 13763ea895f..1cd9524d544 100644
--- a/opal/mca/hwloc/base/hwloc_base_dt.c
+++ b/opal/mca/hwlocxxx/base/hwloc_base_dt.c
@@ -1,5 +1,7 @@
 /*
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2017      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  *
  * $COPYRIGHT$
  *
@@ -12,7 +14,7 @@
 #include "opal/util/output.h"
 
 #include "opal/dss/dss.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 
 int opal_hwloc_pack(opal_buffer_t *buffer, const void *src,
                     int32_t num_vals,
@@ -222,7 +224,7 @@ int opal_hwloc_compare(const hwloc_topology_t topo1,
         s1->cpubind->set_thisthread_cpubind != s2->cpubind->set_thisthread_cpubind ||
         s1->membind->set_thisproc_membind != s2->membind->set_thisproc_membind ||
         s1->membind->set_thisthread_membind != s2->membind->set_thisthread_membind) {
-        OPAL_OUTPUT_VERBOSE((5, opal_hwloc_base_framework.framework_output,
+        OPAL_OUTPUT_VERBOSE((5, opal_hwlocxxx_base_framework.framework_output,
                              "hwloc:base:compare BINDING CAPABILITIES DIFFER"));
         return OPAL_VALUE1_GREATER;
     }
diff --git a/opal/mca/hwloc/base/hwloc_base_frame.c b/opal/mca/hwlocxxx/base/hwloc_base_frame.c
similarity index 97%
rename from opal/mca/hwloc/base/hwloc_base_frame.c
rename to opal/mca/hwlocxxx/base/hwloc_base_frame.c
index c4eb13bd815..6b0705c50cc 100644
--- a/opal/mca/hwloc/base/hwloc_base_frame.c
+++ b/opal/mca/hwlocxxx/base/hwloc_base_frame.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2011-2014 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
- * Copyright (c) 2016      Research Organization for Information Science
+ * Copyright (c) 2016 -2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
@@ -22,8 +22,8 @@
 #include "opal/mca/base/base.h"
 #include "opal/threads/tsd.h"
 
-#include "opal/mca/hwloc/hwloc.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/hwlocxxx.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 
 
 /*
@@ -31,7 +31,7 @@
  * statements and the definition of an array of pointers to each
  * component's public mca_base_component_t struct.
  */
-#include "opal/mca/hwloc/base/static-components.h"
+#include "opal/mca/hwlocxxx/base/static-components.h"
 
 
 /*
@@ -76,8 +76,8 @@ static int opal_hwloc_base_register(mca_base_register_flag_t flags);
 static int opal_hwloc_base_open(mca_base_open_flag_t flags);
 static int opal_hwloc_base_close(void);
 
-MCA_BASE_FRAMEWORK_DECLARE(opal, hwloc, NULL, opal_hwloc_base_register, opal_hwloc_base_open, opal_hwloc_base_close,
-                           mca_hwloc_base_static_components, 0);
+MCA_BASE_FRAMEWORK_DECLARE(opal, hwlocxxx, NULL, opal_hwloc_base_register, opal_hwloc_base_open, opal_hwloc_base_close,
+                           mca_hwlocxxx_base_static_components, 0);
 
 static char *opal_hwloc_base_binding_policy = NULL;
 static bool opal_hwloc_base_bind_to_core = false;
@@ -229,7 +229,7 @@ static int opal_hwloc_base_open(mca_base_open_flag_t flags)
      * to a list
      */
     if (OPAL_SUCCESS !=
-        mca_base_framework_components_open(&opal_hwloc_base_framework, flags)) {
+        mca_base_framework_components_open(&opal_hwlocxxx_base_framework, flags)) {
         return OPAL_ERROR;
     }
 
@@ -258,7 +258,7 @@ static int opal_hwloc_base_close(void)
     /* no need to close the component as it was statically opened */
 
     /* for support of tools such as ompi_info */
-    ret = mca_base_framework_components_close (&opal_hwloc_base_framework, NULL);
+    ret = mca_base_framework_components_close (&opal_hwlocxxx_base_framework, NULL);
     if (OPAL_SUCCESS != ret) {
         return ret;
     }
diff --git a/opal/mca/hwloc/base/hwloc_base_maffinity.c b/opal/mca/hwlocxxx/base/hwloc_base_maffinity.c
similarity index 95%
rename from opal/mca/hwloc/base/hwloc_base_maffinity.c
rename to opal/mca/hwlocxxx/base/hwloc_base_maffinity.c
index 1ed653c77ee..8d0e0885ce3 100644
--- a/opal/mca/hwloc/base/hwloc_base_maffinity.c
+++ b/opal/mca/hwlocxxx/base/hwloc_base_maffinity.c
@@ -1,6 +1,8 @@
 /*
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2016      Intel, Inc.  All rights reserved.
+ * Copyright (c) 2017      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -13,8 +15,8 @@
 
 #include "opal/constants.h"
 
-#include "opal/mca/hwloc/hwloc.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/hwlocxxx.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 
 
 /*
diff --git a/opal/mca/hwloc/base/hwloc_base_proc_mempolicy.c b/opal/mca/hwlocxxx/base/hwloc_base_proc_mempolicy.c
similarity index 89%
rename from opal/mca/hwloc/base/hwloc_base_proc_mempolicy.c
rename to opal/mca/hwlocxxx/base/hwloc_base_proc_mempolicy.c
index b3715f60928..2b6480bb2c9 100644
--- a/opal/mca/hwloc/base/hwloc_base_proc_mempolicy.c
+++ b/opal/mca/hwlocxxx/base/hwloc_base_proc_mempolicy.c
@@ -1,5 +1,7 @@
 /*
  * Copyright (c) 2011      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2017      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -12,8 +14,8 @@
 
 #include "opal/constants.h"
 
-#include "opal/mca/hwloc/hwloc.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwloc/hwlocxxx.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 
 
 /*
diff --git a/opal/mca/hwloc/base/hwloc_base_util.c b/opal/mca/hwlocxxx/base/hwloc_base_util.c
similarity index 96%
rename from opal/mca/hwloc/base/hwloc_base_util.c
rename to opal/mca/hwlocxxx/base/hwloc_base_util.c
index b89081158ec..b3f2a017678 100644
--- a/opal/mca/hwloc/base/hwloc_base_util.c
+++ b/opal/mca/hwlocxxx/base/hwloc_base_util.c
@@ -14,7 +14,7 @@
  * Copyright (c) 2012-2015 Los Alamos National Security, LLC.
  *                         All rights reserved.
  * Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
- * Copyright (c) 2015-2016 Research Organization for Information Science
+ * Copyright (c) 2015-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
@@ -42,8 +42,8 @@
 #include "opal/threads/tsd.h"
 #include "opal/mca/pmix/pmix.h"
 
-#include "opal/mca/hwloc/hwloc.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/hwlocxxx.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 
 /*
  * Provide the hwloc object that corresponds to the given
@@ -82,7 +82,7 @@ hwloc_obj_t opal_hwloc_base_get_pu(hwloc_topology_t topo,
          * numbered within their sockets instead). So we find the
          * specified PU, and then return the core object that contains it */
         obj = hwloc_get_pu_obj_by_os_index(topo, lid);
-        OPAL_OUTPUT_VERBOSE((5, opal_hwloc_base_framework.framework_output,
+        OPAL_OUTPUT_VERBOSE((5, opal_hwlocxxx_base_framework.framework_output,
                              "physical cpu %d %s found in cpuset %s",
                              lid, (NULL == obj) ? "not" : "is",
                              (NULL == opal_hwloc_base_cpu_list) ? "None" : opal_hwloc_base_cpu_list));
@@ -93,12 +93,12 @@ hwloc_obj_t opal_hwloc_base_get_pu(hwloc_topology_t topo,
         return obj;
     }
 
-    opal_output_verbose(5, opal_hwloc_base_framework.framework_output,
+    opal_output_verbose(5, opal_hwlocxxx_base_framework.framework_output,
                         "Searching for %d LOGICAL PU", lid);
 
     /* Now do the actual lookup. */
     obj = hwloc_get_obj_by_type(topo, obj_type, lid);
-    OPAL_OUTPUT_VERBOSE((5, opal_hwloc_base_framework.framework_output,
+    OPAL_OUTPUT_VERBOSE((5, opal_hwlocxxx_base_framework.framework_output,
                          "logical cpu %d %s found in cpuset %s",
                          lid, (NULL == obj) ? "not" : "is",
                          (NULL == opal_hwloc_base_cpu_list) ? "None" : opal_hwloc_base_cpu_list));
@@ -136,10 +136,10 @@ int opal_hwloc_base_filter_cpus(hwloc_topology_t topo)
         /* get the root available cpuset */
         avail = hwloc_bitmap_alloc();
         hwloc_bitmap_and(avail, root->online_cpuset, root->allowed_cpuset);
-        OPAL_OUTPUT_VERBOSE((5, opal_hwloc_base_framework.framework_output,
+        OPAL_OUTPUT_VERBOSE((5, opal_hwlocxxx_base_framework.framework_output,
                              "hwloc:base: no cpus specified - using root available cpuset"));
     } else {
-        OPAL_OUTPUT_VERBOSE((5, opal_hwloc_base_framework.framework_output,
+        OPAL_OUTPUT_VERBOSE((5, opal_hwlocxxx_base_framework.framework_output,
                              "hwloc:base: filtering cpuset"));
         /* find the specified logical cpus */
         ranges = opal_argv_split(opal_hwloc_base_cpu_list, ',');
@@ -245,7 +245,7 @@ int opal_hwloc_base_get_topology(void)
     opal_process_name_t wildcard_rank;
     char *val = NULL;
 
-    OPAL_OUTPUT_VERBOSE((2, opal_hwloc_base_framework.framework_output,
+    OPAL_OUTPUT_VERBOSE((2, opal_hwlocxxx_base_framework.framework_output,
                          "hwloc:base:get_topology"));
 
     /* see if we already got it */
@@ -255,7 +255,7 @@ int opal_hwloc_base_get_topology(void)
 
     if (NULL != opal_pmix.get) {
         /* try to retrieve it from the PMIx store */
-        opal_output_verbose(1, opal_hwloc_base_framework.framework_output,
+        opal_output_verbose(1, opal_hwlocxxx_base_framework.framework_output,
                             "hwloc:base instantiating topology");
         wildcard_rank.jobid = OPAL_PROC_MY_NAME.jobid;
         wildcard_rank.vpid = OPAL_VPID_WILDCARD;
@@ -333,7 +333,7 @@ int opal_hwloc_base_set_topology(char *topofile)
     struct hwloc_topology_support *support;
     int rc;
 
-     OPAL_OUTPUT_VERBOSE((5, opal_hwloc_base_framework.framework_output,
+     OPAL_OUTPUT_VERBOSE((5, opal_hwlocxxx_base_framework.framework_output,
                           "hwloc:base:set_topology %s", topofile));
 
    if (NULL != opal_hwloc_topology) {
@@ -344,7 +344,7 @@ int opal_hwloc_base_set_topology(char *topofile)
     }
     if (0 != hwloc_topology_set_xml(opal_hwloc_topology, topofile)) {
         hwloc_topology_destroy(opal_hwloc_topology);
-        OPAL_OUTPUT_VERBOSE((5, opal_hwloc_base_framework.framework_output,
+        OPAL_OUTPUT_VERBOSE((5, opal_hwlocxxx_base_framework.framework_output,
                              "hwloc:base:set_topology bad topo file"));
         return OPAL_ERR_NOT_SUPPORTED;
     }
@@ -360,7 +360,7 @@ int opal_hwloc_base_set_topology(char *topofile)
     }
     if (0 != hwloc_topology_load(opal_hwloc_topology)) {
         hwloc_topology_destroy(opal_hwloc_topology);
-        OPAL_OUTPUT_VERBOSE((5, opal_hwloc_base_framework.framework_output,
+        OPAL_OUTPUT_VERBOSE((5, opal_hwlocxxx_base_framework.framework_output,
                              "hwloc:base:set_topology failed to load"));
         return OPAL_ERR_NOT_SUPPORTED;
     }
@@ -481,7 +481,7 @@ hwloc_cpuset_t opal_hwloc_base_get_available_cpus(hwloc_topology_t topo,
     opal_hwloc_topo_data_t *rdata;
     opal_hwloc_obj_data_t *data;
 
-    OPAL_OUTPUT_VERBOSE((10, opal_hwloc_base_framework.framework_output,
+    OPAL_OUTPUT_VERBOSE((10, opal_hwlocxxx_base_framework.framework_output,
                          "hwloc:base: get available cpus"));
 
     /* get the node-level information */
@@ -491,13 +491,13 @@ hwloc_cpuset_t opal_hwloc_base_get_available_cpus(hwloc_topology_t topo,
     if (NULL == rdata) {
         rdata = OBJ_NEW(opal_hwloc_topo_data_t);
         root->userdata = (void*)rdata;
-        OPAL_OUTPUT_VERBOSE((5, opal_hwloc_base_framework.framework_output,
+        OPAL_OUTPUT_VERBOSE((5, opal_hwlocxxx_base_framework.framework_output,
                              "hwloc:base:get_available_cpus first time - filtering cpus"));
     }
 
     /* are we asking about the root object? */
     if (obj == root) {
-        OPAL_OUTPUT_VERBOSE((5, opal_hwloc_base_framework.framework_output,
+        OPAL_OUTPUT_VERBOSE((5, opal_hwlocxxx_base_framework.framework_output,
                              "hwloc:base:get_available_cpus root object"));
         return rdata->available;
     }
@@ -667,7 +667,7 @@ unsigned int opal_hwloc_base_get_obj_idx(hwloc_topology_t topo,
     hwloc_obj_t ptr;
     unsigned int nobjs, i;
 
-    OPAL_OUTPUT_VERBOSE((5, opal_hwloc_base_framework.framework_output,
+    OPAL_OUTPUT_VERBOSE((5, opal_hwlocxxx_base_framework.framework_output,
                          "hwloc:base:get_idx"));
 
     /* see if we already have the info */
@@ -679,7 +679,7 @@ unsigned int opal_hwloc_base_get_obj_idx(hwloc_topology_t topo,
     }
 
     if (data->idx < UINT_MAX) {
-        OPAL_OUTPUT_VERBOSE((5, opal_hwloc_base_framework.framework_output,
+        OPAL_OUTPUT_VERBOSE((5, opal_hwlocxxx_base_framework.framework_output,
                              "hwloc:base:get_idx already have data: %u",
                              data->idx));
         return data->idx;
@@ -691,7 +691,7 @@ unsigned int opal_hwloc_base_get_obj_idx(hwloc_topology_t topo,
     }
     nobjs = opal_hwloc_base_get_nbobjs_by_type(topo, obj->type, cache_level, rtype);
 
-    OPAL_OUTPUT_VERBOSE((5, opal_hwloc_base_framework.framework_output,
+    OPAL_OUTPUT_VERBOSE((5, opal_hwlocxxx_base_framework.framework_output,
                          "hwloc:base:get_idx found %u objects of type %s:%u",
                          nobjs, hwloc_obj_type_string(obj->type), cache_level));
 
@@ -837,7 +837,7 @@ unsigned int opal_hwloc_base_get_nbobjs_by_type(hwloc_topology_t topo,
 
     /* bozo check */
     if (NULL == topo) {
-        OPAL_OUTPUT_VERBOSE((5, opal_hwloc_base_framework.framework_output,
+        OPAL_OUTPUT_VERBOSE((5, opal_hwlocxxx_base_framework.framework_output,
                              "hwloc:base:get_nbobjs NULL topology"));
         return 0;
     }
@@ -874,7 +874,7 @@ unsigned int opal_hwloc_base_get_nbobjs_by_type(hwloc_topology_t topo,
                 cache_level == sum->cache_level &&
                 rtype == sum->rtype) {
                 /* yep - return the value */
-                OPAL_OUTPUT_VERBOSE((5, opal_hwloc_base_framework.framework_output,
+                OPAL_OUTPUT_VERBOSE((5, opal_hwlocxxx_base_framework.framework_output,
                                      "hwloc:base:get_nbojbs pre-existing data %u of %s:%u",
                                      sum->num_objs, hwloc_obj_type_string(target), cache_level));
                 return sum->num_objs;
@@ -893,7 +893,7 @@ unsigned int opal_hwloc_base_get_nbobjs_by_type(hwloc_topology_t topo,
     sum->rtype = rtype;
     opal_list_append(&data->summaries, &sum->super);
 
-    OPAL_OUTPUT_VERBOSE((5, opal_hwloc_base_framework.framework_output,
+    OPAL_OUTPUT_VERBOSE((5, opal_hwlocxxx_base_framework.framework_output,
                          "hwloc:base:get_nbojbs computed data %u of %s:%u",
                          num_objs, hwloc_obj_type_string(target), cache_level));
 
@@ -925,7 +925,7 @@ static hwloc_obj_t df_search_min_bound(hwloc_topology_t topo,
             start->userdata = data;
         }
 
-        OPAL_OUTPUT_VERBOSE((5, opal_hwloc_base_framework.framework_output,
+        OPAL_OUTPUT_VERBOSE((5, opal_hwlocxxx_base_framework.framework_output,
                              "hwloc:base:min_bound_under_obj object %s:%u nbound %u min %u",
                              hwloc_obj_type_string(target), start->logical_index,
                              data->num_bound, *min_bound));
@@ -966,7 +966,7 @@ hwloc_obj_t opal_hwloc_base_find_min_bound_target_under_obj(hwloc_topology_t top
 
     /* bozo check */
     if (NULL == topo || NULL == obj) {
-        OPAL_OUTPUT_VERBOSE((5, opal_hwloc_base_framework.framework_output,
+        OPAL_OUTPUT_VERBOSE((5, opal_hwlocxxx_base_framework.framework_output,
                              "hwloc:base:find_min_bound_under_obj NULL %s",
                              (NULL == topo) ? "topology" : "object"));
         return NULL;
@@ -997,12 +997,12 @@ hwloc_obj_t opal_hwloc_base_find_min_bound_target_under_obj(hwloc_topology_t top
 
     if (NULL != loc) {
         if (HWLOC_OBJ_CACHE == target) {
-            OPAL_OUTPUT_VERBOSE((5, opal_hwloc_base_framework.framework_output,
+            OPAL_OUTPUT_VERBOSE((5, opal_hwlocxxx_base_framework.framework_output,
                         "hwloc:base:min_bound_under_obj found min bound of %u on %s:%u:%u",
                         min_bound, hwloc_obj_type_string(target),
                         cache_level, loc->logical_index));
         } else {
-            OPAL_OUTPUT_VERBOSE((5, opal_hwloc_base_framework.framework_output,
+            OPAL_OUTPUT_VERBOSE((5, opal_hwlocxxx_base_framework.framework_output,
                         "hwloc:base:min_bound_under_obj found min bound of %u on %s:%u",
                         min_bound, hwloc_obj_type_string(target), loc->logical_index));
         }
@@ -1066,7 +1066,7 @@ void opal_hwloc_base_clear_usage(hwloc_topology_t topo)
 
     /* bozo check */
     if (NULL == topo) {
-        OPAL_OUTPUT_VERBOSE((5, opal_hwloc_base_framework.framework_output,
+        OPAL_OUTPUT_VERBOSE((5, opal_hwlocxxx_base_framework.framework_output,
                              "hwloc:base:clear_usage: NULL topology"));
         return;
     }
@@ -1215,7 +1215,7 @@ static int socket_core_to_cpu_set(char *socket_core_list,
                 break;
 
             case 2:  /* range of core id's was given */
-                opal_output_verbose(5, opal_hwloc_base_framework.framework_output,
+                opal_output_verbose(5, opal_hwlocxxx_base_framework.framework_output,
                                     "range of cores given: start %s stop %s",
                                     range[0], range[1]);
                 lower_range = atoi(range[0]);
@@ -1271,7 +1271,7 @@ int opal_hwloc_base_cpu_list_parse(const char *slot_str,
         return OPAL_ERR_BAD_PARAM;
     }
 
-    opal_output_verbose(5, opal_hwloc_base_framework.framework_output,
+    opal_output_verbose(5, opal_hwlocxxx_base_framework.framework_output,
                         "slot assignment: slot_list == %s",
                         slot_str);
 
@@ -1282,7 +1282,7 @@ int opal_hwloc_base_cpu_list_parse(const char *slot_str,
     hwloc_bitmap_zero(cpumask);
     /* loop across the items and accumulate the mask */
     for (i=0; NULL != item[i]; i++) {
-        opal_output_verbose(5, opal_hwloc_base_framework.framework_output,
+        opal_output_verbose(5, opal_hwlocxxx_base_framework.framework_output,
                             "working assignment %s",
                             item[i]);
         /* if they specified "socket" by starting with an S/s,
@@ -1497,7 +1497,7 @@ opal_hwloc_locality_t opal_hwloc_base_get_relative_locality(hwloc_topology_t top
         }
     }
 
-    opal_output_verbose(5, opal_hwloc_base_framework.framework_output,
+    opal_output_verbose(5, opal_hwlocxxx_base_framework.framework_output,
                         "locality: %s",
                         opal_hwloc_base_print_locality(locality));
     hwloc_bitmap_free(loc1);
@@ -1522,7 +1522,7 @@ char* opal_hwloc_base_find_coprocessors(hwloc_topology_t topo)
      * see if we have any of those
      */
     if (HWLOC_TYPE_DEPTH_UNKNOWN == (depth = hwloc_get_type_depth(topo, HWLOC_OBJ_OS_DEVICE))) {
-        OPAL_OUTPUT_VERBOSE((5, opal_hwloc_base_framework.framework_output,
+        OPAL_OUTPUT_VERBOSE((5, opal_hwlocxxx_base_framework.framework_output,
                              "hwloc:base:find_coprocessors: NONE FOUND IN TOPO"));
         return NULL;
     }
@@ -1533,7 +1533,7 @@ char* opal_hwloc_base_find_coprocessors(hwloc_topology_t topo)
             /* got one! find and save its serial number */
             for (i=0; i < osdev->infos_count; i++) {
                 if (0 == strncmp(osdev->infos[i].name, "MICSerialNumber", strlen("MICSerialNumber"))) {
-                    OPAL_OUTPUT_VERBOSE((5, opal_hwloc_base_framework.framework_output,
+                    OPAL_OUTPUT_VERBOSE((5, opal_hwlocxxx_base_framework.framework_output,
                                          "hwloc:base:find_coprocessors: coprocessor %s found",
                                          osdev->infos[i].value));
                     opal_argv_append_nosize(&cps, osdev->infos[i].value);
@@ -1546,7 +1546,7 @@ char* opal_hwloc_base_find_coprocessors(hwloc_topology_t topo)
         cpstring = opal_argv_join(cps, ',');
         opal_argv_free(cps);
     }
-    OPAL_OUTPUT_VERBOSE((5, opal_hwloc_base_framework.framework_output,
+    OPAL_OUTPUT_VERBOSE((5, opal_hwlocxxx_base_framework.framework_output,
                          "hwloc:base:find_coprocessors: hosting coprocessors %s",
                          (NULL == cpstring) ? "NONE" : cpstring));
     return cpstring;
@@ -1615,7 +1615,7 @@ char* opal_hwloc_base_check_on_coprocessor(void)
         free(cptr);
     }
     fclose(fp);
-    OPAL_OUTPUT_VERBOSE((5, opal_hwloc_base_framework.framework_output,
+    OPAL_OUTPUT_VERBOSE((5, opal_hwlocxxx_base_framework.framework_output,
                          "hwloc:base:check_coprocessor: on coprocessor %s",
                          (NULL == cp) ? "NONE" : cp));
     return cp;
@@ -2022,7 +2022,7 @@ static void sort_by_dist(hwloc_topology_t topo, char* device_name, opal_list_t *
                     obj = obj->parent;
                 }
                 if (obj == NULL) {
-                    opal_output_verbose(5, opal_hwloc_base_framework.framework_output,
+                    opal_output_verbose(5, opal_hwlocxxx_base_framework.framework_output,
                             "hwloc:base:get_sorted_numa_list: NUMA node closest to %s wasn't found.",
                             device_name);
                     return;
@@ -2036,7 +2036,7 @@ static void sort_by_dist(hwloc_topology_t topo, char* device_name, opal_list_t *
                     /* we can try to find distances under group object. This info can be there. */
                     depth = hwloc_get_type_depth(topo, HWLOC_OBJ_NODE);
                     if (HWLOC_TYPE_DEPTH_UNKNOWN == depth) {
-                        opal_output_verbose(5, opal_hwloc_base_framework.framework_output,
+                        opal_output_verbose(5, opal_hwlocxxx_base_framework.framework_output,
                                 "hwloc:base:get_sorted_numa_list: There is no information about distances on the node.");
                         return;
                     }
@@ -2055,7 +2055,7 @@ static void sort_by_dist(hwloc_topology_t topo, char* device_name, opal_list_t *
                 }
                 /* find all distances for our close node with logical index = close_node_index as close_node_index + nbobjs*j */
                 if ((NULL == distances) || (0 == distances->nbobjs)) {
-                    opal_output_verbose(5, opal_hwloc_base_framework.framework_output,
+                    opal_output_verbose(5, opal_hwlocxxx_base_framework.framework_output,
                             "hwloc:base:get_sorted_numa_list: There is no information about distances on the node.");
                     return;
                 }
diff --git a/opal/mca/hwloc/base/owner.txt b/opal/mca/hwlocxxx/base/owner.txt
similarity index 100%
rename from opal/mca/hwloc/base/owner.txt
rename to opal/mca/hwlocxxx/base/owner.txt
diff --git a/opal/mca/hwloc/configure.m4 b/opal/mca/hwlocxxx/configure.m4
similarity index 91%
rename from opal/mca/hwloc/configure.m4
rename to opal/mca/hwlocxxx/configure.m4
index 10ec72be92a..fd8a8eaa891 100644
--- a/opal/mca/hwloc/configure.m4
+++ b/opal/mca/hwlocxxx/configure.m4
@@ -1,6 +1,8 @@
 dnl -*- shell-script -*-
 dnl
 dnl Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
+dnl Copyright (c) 2017      Research Organization for Information Science
+dnl                         and Technology (RIST). All rights reserved.
 dnl $COPYRIGHT$
 dnl
 dnl Additional copyrights may follow
@@ -10,15 +12,12 @@ dnl
 
 # There will only be one component used in this framework, and it will
 # be selected at configure time by priority.  Components must set
-# their priorities in their configure.m4 files.  They must also set
-# the shell variable $opal_hwloc_base_include to a header file
-# name (relative to the top OMPI source directory) that will be
-# included in opal/mca/hwloc/hwloc.h.
+# their priorities in their configure.m4 files.
 
 dnl We only want one winning component (vs. STOP_AT_FIRST_PRIORITY,
 dnl which will allow all components of the same priority who succeed to
 dnl win)
-m4_define(MCA_opal_hwloc_CONFIGURE_MODE, STOP_AT_FIRST)
+m4_define(MCA_opal_hwlocxxx_CONFIGURE_MODE, STOP_AT_FIRST)
 
 # Other components may depend on at least 1 hwloc component being
 # available.  As such, we may need to artificially force this
@@ -26,16 +25,16 @@ m4_define(MCA_opal_hwloc_CONFIGURE_MODE, STOP_AT_FIRST)
 # the hwloc framework's m4 to a separate macro and AC REQUIRE it.
 # Other components can do this as well.
 
-AC_DEFUN([MCA_opal_hwloc_CONFIG],[
+AC_DEFUN([MCA_opal_hwlocxxx_CONFIG],[
     # Use a crude shell variable to know whether this component is
     # being required "early".  See below.
     opal_hwloc_its_time_to_configure=1
-    AC_REQUIRE([MCA_opal_hwloc_CONFIG_REQUIRE])
+    AC_REQUIRE([MCA_opal_hwlocxxx_CONFIG_REQUIRE])
 ])
 
 # See comments above for why this is a separate macro.
 
-AC_DEFUN([MCA_opal_hwloc_CONFIG_REQUIRE],[
+AC_DEFUN([MCA_opal_hwlocxxx_CONFIG_REQUIRE],[
     opal_hwloc_base_include=
 
    # If this shell variable is not 1, then this m4 is being invoked
@@ -83,7 +82,7 @@ AC_DEFUN([MCA_opal_hwloc_CONFIG_REQUIRE],[
     # the traditional $1 and $2 as the first arguments, we hard-code
     # "opal" and "hwloc", because this macro is invoked via AC
     # REQUIRE.
-    MCA_CONFIGURE_FRAMEWORK([opal], [hwloc], 1)
+    MCA_CONFIGURE_FRAMEWORK([opal], [hwlocxxx], 1)
 
     # Restore the --enable-pci flag
     enable_pci=$opal_hwloc_hwloc132_save_enable_pci
@@ -96,13 +95,13 @@ AC_DEFUN([MCA_opal_hwloc_CONFIG_REQUIRE],[
     AS_IF([test "$with_hwloc" = ""], [],
        [ # STOP_AT_FIRST_PRIORITY will guarantee that we find at most
         # one.  We need to check here that we found *at least* one.
-        AS_IF([test "$MCA_opal_hwloc_STATIC_COMPONENTS" = ""],
+        AS_IF([test "$MCA_opal_hwlocxxx_STATIC_COMPONENTS" = ""],
               [AC_MSG_WARN([Did not find a suitable static opal hwloc component])
                AC_MSG_ERROR([Cannot continue])])
    ])
 
    # If we have a winning component, do some more logic
-   AS_IF([test "$MCA_opal_hwloc_STATIC_COMPONENTS" != ""],
+   AS_IF([test "$MCA_opal_hwlocxxx_STATIC_COMPONENTS" != ""],
        [ # We had a winner -- w00t!
         # The winning component will have told us where their header file
         # is located
diff --git a/opal/mca/hwloc/external/Makefile.am b/opal/mca/hwlocxxx/external/Makefile.am
similarity index 63%
rename from opal/mca/hwloc/external/Makefile.am
rename to opal/mca/hwlocxxx/external/Makefile.am
index 96ced55e717..99cb8b2db69 100644
--- a/opal/mca/hwloc/external/Makefile.am
+++ b/opal/mca/hwlocxxx/external/Makefile.am
@@ -1,6 +1,8 @@
 #
 # Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2016      Intel, Inc. All rights reserved.
+# Copyright (c) 2017      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -14,15 +16,15 @@
 
 # We only ever build this component statically
 
-noinst_LTLIBRARIES = libmca_hwloc_external.la
+noinst_LTLIBRARIES = libmca_hwlocxxx_external.la
 
-libmca_hwloc_external_la_SOURCES = \
+libmca_hwlocxxx_external_la_SOURCES = \
         external.h \
         hwloc_external_component.c
-libmca_hwloc_external_la_LDFLAGS = \
+libmca_hwlocxxx_external_la_LDFLAGS = \
     -module -avoid-version \
-    $(opal_hwloc_external_LDFLAGS)
-libmca_hwloc_external_la_LIBADD = $(hwloc_external_LIBS) -lhwloc
+    $(opal_hwlocxxx_external_LDFLAGS)
+libmca_hwlocxxx_external_la_LIBADD = $(hwlocxxx_external_LIBS) -lhwloc
 
 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
diff --git a/opal/mca/hwloc/external/configure.m4 b/opal/mca/hwlocxxx/external/configure.m4
similarity index 88%
rename from opal/mca/hwloc/external/configure.m4
rename to opal/mca/hwlocxxx/external/configure.m4
index 83bae5bb074..c249dd72abf 100644
--- a/opal/mca/hwloc/external/configure.m4
+++ b/opal/mca/hwlocxxx/external/configure.m4
@@ -1,7 +1,7 @@
 # -*- shell-script -*-
 #
 # Copyright (c) 2009-2016 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2014-2016 Research Organization for Information Science
+# Copyright (c) 2014-2017 Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
 #
 # $COPYRIGHT$
@@ -14,21 +14,21 @@
 #
 # Priority
 #
-AC_DEFUN([MCA_opal_hwloc_external_PRIORITY], [90])
+AC_DEFUN([MCA_opal_hwlocxxx_external_PRIORITY], [90])
 
 #
 # Force this component to compile in static-only mode
 #
-AC_DEFUN([MCA_opal_hwloc_external_COMPILE_MODE], [
+AC_DEFUN([MCA_opal_hwlocxxx_external_COMPILE_MODE], [
     AC_MSG_CHECKING([for MCA component $2:$3 compile mode])
     $4="static"
     AC_MSG_RESULT([$$4])
 ])
 
 
-# MCA_hwloc_external_POST_CONFIG()
+# MCA_hwlocxxx_external_POST_CONFIG()
 # ---------------------------------
-AC_DEFUN([MCA_opal_hwloc_external_POST_CONFIG],[
+AC_DEFUN([MCA_opal_hwlocxxx_external_POST_CONFIG],[
     OPAL_VAR_SCOPE_PUSH([opal_hwloc_external_basedir])
 
     # If we won, then do all the rest of the setup
@@ -39,7 +39,7 @@ AC_DEFUN([MCA_opal_hwloc_external_POST_CONFIG],[
 
            # Set this variable so that the framework m4 knows what
            # file to include in opal/mca/hwloc/hwloc.h
-           opal_hwloc_external_basedir=opal/mca/hwloc/external
+           opal_hwloc_external_basedir=opal/mca/hwlocxxx/external
            opal_hwloc_base_include="$opal_hwloc_external_basedir/external.h"
 
            # Add some stuff to CPPFLAGS so that the rest of the source
@@ -56,8 +56,7 @@ AC_DEFUN([MCA_opal_hwloc_external_POST_CONFIG],[
            # OPAL_HWLOC_WANT_VERBS_HELPER to work.  First, the
            # opal_hwloc_external_include file (set above), points to a
            # file here in this component. That file will include the
-           # actual external hwloc.h file (via the
-           # MCA_hwloc_external_header define).  And if
+           # actual external hwloc.h file.  And if
            # OPAL_HWLOC_WANT_VERBS_HELPER is set, that file will
            # include the external hwloc/openfabrics-verbs.h file (via
            # the MCA_hwloc_external_openfabrics_helper define).
@@ -66,9 +65,6 @@ AC_DEFUN([MCA_opal_hwloc_external_POST_CONFIG],[
                   opal_hwloc_openfabrics_include="$opal_hwloc_dir/include/hwloc/openfabrics-verbs.h"],
                  [opal_hwloc_include="hwloc.h"
                   opal_hwloc_openfabrics_include="hwloc/openfabrics-verbs.h"])
-           AC_DEFINE_UNQUOTED(MCA_hwloc_external_header,
-                  ["$opal_hwloc_include"],
-                  [Location of external hwloc header])
            AC_DEFINE_UNQUOTED(MCA_hwloc_external_openfabrics_header,
                   ["$opal_hwloc_openfabrics_include"],
                   [Location of external hwloc OpenFabrics header])
@@ -77,10 +73,10 @@ AC_DEFUN([MCA_opal_hwloc_external_POST_CONFIG],[
 ])dnl
 
 
-# MCA_hwloc_external_CONFIG([action-if-found], [action-if-not-found])
+# MCA_hwlocxxx_external_CONFIG([action-if-found], [action-if-not-found])
 # --------------------------------------------------------------------
-AC_DEFUN([MCA_opal_hwloc_external_CONFIG],[
-    AC_CONFIG_FILES([opal/mca/hwloc/external/Makefile])
+AC_DEFUN([MCA_opal_hwlocxxx_external_CONFIG],[
+    AC_CONFIG_FILES([opal/mca/hwlocxxx/external/Makefile])
 
     OPAL_VAR_SCOPE_PUSH([opal_hwloc_external_CPPFLAGS_save opal_hwloc_external_CFLAGS_save opal_hwloc_external_LDFLAGS_save opal_hwloc_external_LIBS_save opal_hwloc_external_want opal_hwloc_external_tmp opal_hwloc_external_lstopo])
 
@@ -200,15 +196,15 @@ Cannot continue])])
            # Finally, add some flags to the wrapper compiler if we're
            # building with developer headers so that our headers can
            # be found.
-           hwloc_external_WRAPPER_EXTRA_CPPFLAGS=$opal_hwloc_external_CPPFLAGS
-           hwloc_external_WRAPPER_EXTRA_LDFLAGS=$opal_hwloc_external_LDFLAGS
-           hwloc_external_WRAPPER_EXTRA_LIBS=$opal_hwloc_external_LIBS
+           hwlocxxx_external_WRAPPER_EXTRA_CPPFLAGS=$opal_hwloc_external_CPPFLAGS
+           hwlocxxx_external_WRAPPER_EXTRA_LDFLAGS=$opal_hwloc_external_LDFLAGS
+           hwlocxxx_external_WRAPPER_EXTRA_LIBS=$opal_hwloc_external_LIBS
 
            $1],
           [$2])
 
-    AC_SUBST(opal_hwloc_external_LDFLAGS)
-    AC_SUBST(opal_hwloc_external_LIBS)
+    AC_SUBST(opal_hwlocxxx_external_LDFLAGS)
+    AC_SUBST(opal_hwlocxxx_external_LIBS)
 
     OPAL_VAR_SCOPE_POP
 ])dnl
diff --git a/opal/mca/hwloc/external/external.h b/opal/mca/hwlocxxx/external/external.h
similarity index 89%
rename from opal/mca/hwloc/external/external.h
rename to opal/mca/hwlocxxx/external/external.h
index bf392767d30..aedd17657d1 100644
--- a/opal/mca/hwloc/external/external.h
+++ b/opal/mca/hwlocxxx/external/external.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2011-2014 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2016      Research Organization for Information Science
+ * Copyright (c) 2016 -2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  *
  * Copyright (c) 2016      Intel, Inc.  All rights reserved.
@@ -11,7 +11,7 @@
  * $HEADER$
  *
  * When this component is used, this file is included in the rest of
- * the OPAL/ORTE/OMPI code base via opal/mca/hwloc/hwloc.h.  As such,
+ * the OPAL/ORTE/OMPI code base via opal/mca/hwlocxxx/hwlocxxx.h.  As such,
  * this header represents the public interface to this static component.
  */
 
@@ -21,7 +21,7 @@
 BEGIN_C_DECLS
 
 #include <opal_config.h>
-#include MCA_hwloc_external_header
+#include "hwloc.h"
 
 /* If the including file requested it, also include the hwloc verbs
    helper file.  We can't just always include this file (even if we
diff --git a/opal/mca/hwloc/external/hwloc_external_component.c b/opal/mca/hwlocxxx/external/hwloc_external_component.c
similarity index 82%
rename from opal/mca/hwloc/external/hwloc_external_component.c
rename to opal/mca/hwlocxxx/external/hwloc_external_component.c
index 3c3df188d97..b7fc66bbcf4 100644
--- a/opal/mca/hwloc/external/hwloc_external_component.c
+++ b/opal/mca/hwlocxxx/external/hwloc_external_component.c
@@ -3,6 +3,8 @@
  * Copyright (c) 2011      Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2017      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  *
  * $COPYRIGHT$
  *
@@ -14,12 +16,12 @@
 #include "opal_config.h"
 #include "opal/constants.h"
 
-#include "opal/mca/hwloc/hwloc.h"
+#include "opal/mca/hwlocxxx/hwlocxxx.h"
 
 /*
  * Public string showing the sysinfo ompi_linux component version number
  */
-const char *opal_hwloc_external_component_version_string =
+const char *opal_hwlocxxx_external_component_version_string =
     "OPAL hwloc_external hwloc MCA component version " OPAL_VERSION;
 
 
@@ -34,7 +36,7 @@ static int hwloc_external_open(void);
  * and pointers to our public functions in it
  */
 
-const opal_hwloc_component_t mca_hwloc_external_component = {
+const opal_hwloc_component_t mca_hwlocxxx_external_component = {
 
     /* First, the mca_component_t struct containing meta information
        about the component itself */
diff --git a/opal/mca/hwloc/external/owner.txt b/opal/mca/hwlocxxx/external/owner.txt
similarity index 100%
rename from opal/mca/hwloc/external/owner.txt
rename to opal/mca/hwlocxxx/external/owner.txt
diff --git a/opal/mca/hwloc/hwloc1113/Makefile.am b/opal/mca/hwlocxxx/hwloc1113/Makefile.am
similarity index 83%
rename from opal/mca/hwloc/hwloc1113/Makefile.am
rename to opal/mca/hwlocxxx/hwloc1113/Makefile.am
index 78c39895e24..f159e20e752 100644
--- a/opal/mca/hwloc/hwloc1113/Makefile.am
+++ b/opal/mca/hwlocxxx/hwloc1113/Makefile.am
@@ -3,6 +3,8 @@
 # Copyright (c) 2014-2015 Intel, Inc. All right reserved.
 # Copyright (c) 2016      Los Alamos National Security, LLC. All rights
 #                         reserved.
+# Copyright (c) 2017      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -32,12 +34,12 @@ headers = hwloc1113.h
 sources = hwloc1113_component.c
 
 # We only ever build this component statically
-noinst_LTLIBRARIES = libmca_hwloc_hwloc1113.la
-libmca_hwloc_hwloc1113_la_SOURCES = $(headers) $(sources)
-nodist_libmca_hwloc_hwloc1113_la_SOURCES = $(nodist_headers)
-libmca_hwloc_hwloc1113_la_LDFLAGS = -module -avoid-version $(opal_hwloc_hwloc1113_LDFLAGS)
-libmca_hwloc_hwloc1113_la_LIBADD = $(opal_hwloc_hwloc1113_LIBS)
-libmca_hwloc_hwloc1113_la_DEPENDENCIES = \
+noinst_LTLIBRARIES = libmca_hwlocxxx_hwloc1113.la
+libmca_hwlocxxx_hwloc1113_la_SOURCES = $(headers) $(sources)
+nodist_libmca_hwlocxxx_hwloc1113_la_SOURCES = $(nodist_headers)
+libmca_hwlocxxx_hwloc1113_la_LDFLAGS = -module -avoid-version $(opal_hwloc_hwloc1113_LDFLAGS)
+libmca_hwlocxxx_hwloc1113_la_LIBADD = $(opal_hwlocxxx_hwloc1113_LIBS)
+libmca_hwlocxxx_hwloc1113_la_DEPENDENCIES = \
     $(HWLOC_top_builddir)/src/libhwloc_embedded.la
 
 # Since the rest of the code base includes the underlying hwloc.h, we
diff --git a/opal/mca/hwloc/hwloc1113/README-ompi.txt b/opal/mca/hwlocxxx/hwloc1113/README-ompi.txt
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/README-ompi.txt
rename to opal/mca/hwlocxxx/hwloc1113/README-ompi.txt
diff --git a/opal/mca/hwlocxxx/hwloc1113/configure.m4 b/opal/mca/hwlocxxx/hwloc1113/configure.m4
new file mode 100644
index 00000000000..bb28cee8464
--- /dev/null
+++ b/opal/mca/hwlocxxx/hwloc1113/configure.m4
@@ -0,0 +1,187 @@
+# -*- shell-script -*-
+#
+# Copyright (c) 2009-2015 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
+# Copyright (c) 2015-2017 Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
+# Copyright (c) 2016      Los Alamos National Security, LLC. All rights
+#                         reserved.
+#
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+#
+# Priority
+#
+AC_DEFUN([MCA_opal_hwlocxxx_hwloc1113_PRIORITY], [90])
+
+#
+# Force this component to compile in static-only mode
+#
+AC_DEFUN([MCA_opal_hwlocxxx_hwloc1113_COMPILE_MODE], [
+    AC_MSG_CHECKING([for MCA component $2:$3 compile mode])
+    $4="static"
+    AC_MSG_RESULT([$$4])
+])
+
+# Include hwlocxxx m4 files
+m4_include(opal/mca/hwlocxxx/hwloc1113/hwloc/config/hwloc.m4)
+m4_include(opal/mca/hwlocxxx/hwloc1113/hwloc/config/hwloc_pkg.m4)
+m4_include(opal/mca/hwlocxxx/hwloc1113/hwloc/config/hwloc_check_attributes.m4)
+m4_include(opal/mca/hwlocxxx/hwloc1113/hwloc/config/hwloc_check_visibility.m4)
+m4_include(opal/mca/hwlocxxx/hwloc1113/hwloc/config/hwloc_check_vendor.m4)
+m4_include(opal/mca/hwlocxxx/hwloc1113/hwloc/config/hwloc_components.m4)
+
+# MCA_hwlocxxx_hwloc1113_POST_CONFIG()
+# ---------------------------------
+AC_DEFUN([MCA_opal_hwlocxxx_hwloc1113_POST_CONFIG],[
+    OPAL_VAR_SCOPE_PUSH([opal_hwloc_hwloc1113_basedir])
+
+    # If we won, then do all the rest of the setup
+    AS_IF([test "$1" = "1" && test "$opal_hwlocxxx_hwloc1113_support" = "yes"],
+          [
+           # Set this variable so that the framework m4 knows what
+           # file to include in opal/mca/hwloc/hwloc.h
+           opal_hwloc_hwloc1113_basedir=opal/mca/hwlocxxx/hwloc1113
+           opal_hwloc_base_include="$opal_hwloc_hwloc1113_basedir/hwloc1113.h"
+
+           # Add some stuff to CPPFLAGS so that the rest of the source
+           # tree can be built
+           file=$opal_hwloc_hwloc1113_basedir/hwloc
+           CPPFLAGS="-I$OPAL_TOP_SRCDIR/$file/include $CPPFLAGS"
+           AS_IF([test "$OPAL_TOP_BUILDDIR" != "$OPAL_TOP_SRCDIR"],
+                 [CPPFLAGS="-I$OPAL_TOP_BUILDDIR/$file/include $CPPFLAGS"])
+           unset file
+          ])
+    OPAL_VAR_SCOPE_POP
+
+    # This must be run unconditionally
+    HWLOC_DO_AM_CONDITIONALS
+])dnl
+
+
+# MCA_hwlocxxx_hwloc1113_CONFIG([action-if-found], [action-if-not-found])
+# --------------------------------------------------------------------
+AC_DEFUN([MCA_opal_hwlocxxx_hwloc1113_CONFIG],[
+    # Hwloc needs to know if we have Verbs support
+    AC_REQUIRE([OPAL_CHECK_VERBS_DIR])
+
+    AC_CONFIG_FILES([opal/mca/hwlocxxx/hwloc1113/Makefile])
+
+    OPAL_VAR_SCOPE_PUSH([HWLOC_VERSION opal_hwlocxxx_hwloc1113_save_CPPFLAGS opal_hwlocxxx_hwloc1113_save_LDFLAGS opal_hwlocxxx_hwloc1113_save_LIBS opal_hwlocxxx_hwloc1113_save_cairo opal_hwlocxxx_hwloc1113_save_xml opal_hwlocxxx_hwloc1113_basedir opal_hwlocxxx_hwloc1113_file opal_hwlocxxx_hwloc1113_save_cflags CPPFLAGS_save LIBS_save opal_hwlocxxx_external])
+
+    # default to this component not providing support
+    opal_hwlocxxx_hwloc1113_basedir=opal/mca/hwlocxxx/hwloc1113
+    opal_hwlocxxx_hwloc1113_support=no
+
+    AS_IF([test "$with_hwloc" = "internal" || test -z "$with_hwloc" || test "$with_hwloc" = "yes"],
+          [opal_hwlocxxx_external="no"],
+          [opal_hwlocxxx_external="yes"])
+
+    opal_hwlocxxx_hwloc1113_save_CPPFLAGS=$CPPFLAGS
+    opal_hwlocxxx_hwloc1113_save_LDFLAGS=$LDFLAGS
+    opal_hwlocxxx_hwloc1113_save_LIBS=$LIBS
+
+    # Run the hwlocxxx configuration - if no external hwloc, then set the prefix
+    # to minimize the chance that someone will use the internal symbols
+    AS_IF([test "$opal_hwlocxxx_external" = "no"],
+          [HWLOC_SET_SYMBOL_PREFIX([opal_hwloc1113_])])
+
+    # save XML or graphical options
+    opal_hwlocxxx_hwloc1113_save_cairo=$enable_cairo
+    opal_hwlocxxx_hwloc1113_save_xml=$enable_xml
+    opal_hwlocxxx_hwloc1113_save_static=$enable_static
+    opal_hwlocxxx_hwloc1113_save_shared=$enable_shared
+    opal_hwlocxxx_hwloc1113_save_plugins=$enable_plugins
+
+    # never enable hwloc's graphical option
+    enable_cairo=no
+
+    # never enable hwloc's plugin system
+    enable_plugins=no
+    enable_static=yes
+    enable_shared=no
+
+    # Override -- disable hwloc's libxml2 support, but enable the
+    # native hwloc XML support
+    enable_libxml2=no
+    enable_xml=yes
+
+    # hwloc checks for compiler visibility, and its needs to do
+    # this without "picky" flags.
+    opal_hwlocxxx_hwloc1113_save_cflags=$CFLAGS
+    CFLAGS=$OPAL_CFLAGS_BEFORE_PICKY
+    HWLOC_SETUP_CORE([opal/mca/hwlocxxx/hwloc1113/hwloc],
+              [AC_MSG_CHECKING([whether hwloc configure succeeded])
+               AC_MSG_RESULT([yes])
+               HWLOC_VERSION="internal v`$srcdir/$opal_hwlocxxx_hwloc1113_basedir/hwloc/config/hwloc_get_version.sh $srcdir/$opal_hwlocxxx_hwloc1113_basedir/hwloc/VERSION`"
+
+               # Build flags for our Makefile.am
+               opal_hwlocxxx_hwloc1113_LDFLAGS='$(HWLOC_EMBEDDED_LDFLAGS)'
+               opal_hwlocxxx_hwloc1113_LIBS='$(OPAL_TOP_BUILDDIR)/'"$opal_hwlocxxx_hwloc1113_basedir"'/hwloc/src/libhwloc_embedded.la $(HWLOC_EMBEDDED_LIBS)'
+               opal_hwlocxxx_hwloc1113_support=yes
+
+               AC_DEFINE_UNQUOTED([HWLOC_HWLOC1113_HWLOC_VERSION],
+                   ["$HWLOC_VERSION"],
+                   [Version of hwloc])
+
+               # Do we have verbs support?
+               CPPFLAGS_save=$CPPFLAGS
+               AS_IF([test "$opal_want_verbs" = "yes"],
+                     [CPPFLAGS="-I$opal_verbs_dir/include $CPPFLAGS"])
+               AC_CHECK_HEADERS([infiniband/verbs.h])
+               CPPFLAGS=$CPPFLAGS_save
+              ],
+              [AC_MSG_CHECKING([whether hwloc configure succeeded])
+               AC_MSG_RESULT([no])
+               opal_hwlocxxx_hwloc1113_support=no])
+    CFLAGS=$opal_hwlocxxx_hwloc1113_save_cflags
+
+    # Restore some env variables, if necessary
+    AS_IF([test -n "$opal_hwlocxxx_hwloc1113_save_cairo"],
+          [enable_cairo=$opal_hwlocxxx_hwloc1113_save_cairo])
+    AS_IF([test -n "$opal_hwlocxxx_hwloc1113_save_xml"],
+          [enable_xml=$opal_hwlocxxx_hwloc1113_save_xml])
+    AS_IF([test -n "$opal_hwlocxxx_hwloc1113_save_static"],
+          [enable_static=$opal_hwlocxxx_hwloc1113_save_static])
+    AS_IF([test -n "$opal_hwlocxxx_hwloc1113_save_shared"],
+          [enable_shared=$opal_hwlocxxx_hwloc1113_save_shared])
+    AS_IF([test -n "$opal_hwlocxxx_hwloc1113_save_plugins"],
+          [enable_plugins=$opal_hwlocxxx_hwloc1113_save_shared])
+
+    CPPFLAGS=$opal_hwlocxxx_hwloc1113_save_CPPFLAGS
+    LDFLAGS=$opal_hwlocxxx_hwloc1113_save_LDFLAGS
+    LIBS=$opal_hwlocxxx_hwloc1113_save_LIBS
+
+    AC_SUBST([opal_hwlocxxx_hwloc1113_CFLAGS])
+    AC_SUBST([opal_hwlocxxx_hwloc1113_CPPFLAGS])
+    AC_SUBST([opal_hwlocxxx_hwloc1113_LDFLAGS])
+    AC_SUBST([opal_hwlocxxx_hwloc1113_LIBS])
+
+    # Finally, add some flags to the wrapper compiler so that our
+    # headers can be found.
+    hwlocxxx_hwloc1113_WRAPPER_EXTRA_LDFLAGS="$HWLOC_EMBEDDED_LDFLAGS"
+    hwlocxxx_hwloc1113_WRAPPER_EXTRA_LIBS="$HWLOC_EMBEDDED_LIBS"
+    hwlocxxx_hwloc1113_WRAPPER_EXTRA_CPPFLAGS='-I${pkgincludedir}/'"$opal_hwlocxxx_hwloc1113_basedir/hwloc/include"
+
+    # If we are not building the internal hwloc, then indicate that
+    # this component should not be built.  NOTE: we still did all the
+    # above configury so that all the proper GNU Autotools
+    # infrastructure is setup properly (e.g., w.r.t. SUBDIRS=hwloc in
+    # this directory's Makefile.am, we still need the Autotools "make
+    # distclean" infrastructure to work properly).
+    AS_IF([test "$opal_hwlocxxx_external" = "yes"],
+          [AC_MSG_WARN([using an external hwloc; disqualifying this component])
+           opal_hwlocxxx_hwloc1113_support=no])
+
+    # Done!
+    AS_IF([test "$opal_hwlocxxx_hwloc1113_support" = "yes"],
+          [$1],
+          [$2])
+
+    OPAL_VAR_SCOPE_POP
+])dnl
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/AUTHORS b/opal/mca/hwlocxxx/hwloc1113/hwloc/AUTHORS
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/AUTHORS
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/AUTHORS
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/COPYING b/opal/mca/hwlocxxx/hwloc1113/hwloc/COPYING
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/COPYING
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/COPYING
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/Makefile.am b/opal/mca/hwlocxxx/hwloc1113/hwloc/Makefile.am
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/Makefile.am
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/Makefile.am
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/NEWS b/opal/mca/hwlocxxx/hwloc1113/hwloc/NEWS
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/NEWS
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/NEWS
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/README b/opal/mca/hwlocxxx/hwloc1113/hwloc/README
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/README
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/README
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/VERSION b/opal/mca/hwlocxxx/hwloc1113/hwloc/VERSION
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/VERSION
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/VERSION
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/config/distscript.sh b/opal/mca/hwlocxxx/hwloc1113/hwloc/config/distscript.sh
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/config/distscript.sh
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/config/distscript.sh
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/config/hwloc.m4 b/opal/mca/hwlocxxx/hwloc1113/hwloc/config/hwloc.m4
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/config/hwloc.m4
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/config/hwloc.m4
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/config/hwloc_check_attributes.m4 b/opal/mca/hwlocxxx/hwloc1113/hwloc/config/hwloc_check_attributes.m4
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/config/hwloc_check_attributes.m4
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/config/hwloc_check_attributes.m4
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/config/hwloc_check_vendor.m4 b/opal/mca/hwlocxxx/hwloc1113/hwloc/config/hwloc_check_vendor.m4
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/config/hwloc_check_vendor.m4
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/config/hwloc_check_vendor.m4
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/config/hwloc_check_visibility.m4 b/opal/mca/hwlocxxx/hwloc1113/hwloc/config/hwloc_check_visibility.m4
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/config/hwloc_check_visibility.m4
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/config/hwloc_check_visibility.m4
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/config/hwloc_components.m4 b/opal/mca/hwlocxxx/hwloc1113/hwloc/config/hwloc_components.m4
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/config/hwloc_components.m4
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/config/hwloc_components.m4
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/config/hwloc_get_version.sh b/opal/mca/hwlocxxx/hwloc1113/hwloc/config/hwloc_get_version.sh
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/config/hwloc_get_version.sh
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/config/hwloc_get_version.sh
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/config/hwloc_internal.m4 b/opal/mca/hwlocxxx/hwloc1113/hwloc/config/hwloc_internal.m4
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/config/hwloc_internal.m4
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/config/hwloc_internal.m4
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/config/hwloc_pkg.m4 b/opal/mca/hwlocxxx/hwloc1113/hwloc/config/hwloc_pkg.m4
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/config/hwloc_pkg.m4
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/config/hwloc_pkg.m4
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/config/test-driver b/opal/mca/hwlocxxx/hwloc1113/hwloc/config/test-driver
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/config/test-driver
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/config/test-driver
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/configure.ac b/opal/mca/hwlocxxx/hwloc1113/hwloc/configure.ac
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/configure.ac
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/configure.ac
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/contrib/hwloc-valgrind.supp b/opal/mca/hwlocxxx/hwloc1113/hwloc/contrib/hwloc-valgrind.supp
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/contrib/hwloc-valgrind.supp
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/contrib/hwloc-valgrind.supp
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/contrib/systemd/README.txt b/opal/mca/hwlocxxx/hwloc1113/hwloc/contrib/systemd/README.txt
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/contrib/systemd/README.txt
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/contrib/systemd/README.txt
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/doc/README.txt b/opal/mca/hwlocxxx/hwloc1113/hwloc/doc/README.txt
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/doc/README.txt
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/doc/README.txt
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/hwloc.pc.in b/opal/mca/hwlocxxx/hwloc1113/hwloc/hwloc.pc.in
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/hwloc.pc.in
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/hwloc.pc.in
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/include/Makefile.am b/opal/mca/hwlocxxx/hwloc1113/hwloc/include/Makefile.am
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/include/Makefile.am
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/include/Makefile.am
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/include/hwloc.h b/opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc.h
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/include/hwloc.h
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc.h
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/autogen/config.h.in b/opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/autogen/config.h.in
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/autogen/config.h.in
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/autogen/config.h.in
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/bitmap.h b/opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/bitmap.h
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/bitmap.h
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/bitmap.h
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/cuda.h b/opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/cuda.h
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/cuda.h
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/cuda.h
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/cudart.h b/opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/cudart.h
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/cudart.h
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/cudart.h
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/deprecated.h b/opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/deprecated.h
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/deprecated.h
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/deprecated.h
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/diff.h b/opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/diff.h
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/diff.h
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/diff.h
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/gl.h b/opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/gl.h
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/gl.h
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/gl.h
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/glibc-sched.h b/opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/glibc-sched.h
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/glibc-sched.h
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/glibc-sched.h
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/helper.h b/opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/helper.h
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/helper.h
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/helper.h
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/inlines.h b/opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/inlines.h
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/inlines.h
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/inlines.h
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/intel-mic.h b/opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/intel-mic.h
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/intel-mic.h
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/intel-mic.h
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/linux-libnuma.h b/opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/linux-libnuma.h
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/linux-libnuma.h
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/linux-libnuma.h
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/linux.h b/opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/linux.h
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/linux.h
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/linux.h
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/myriexpress.h b/opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/myriexpress.h
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/myriexpress.h
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/myriexpress.h
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/nvml.h b/opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/nvml.h
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/nvml.h
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/nvml.h
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/opencl.h b/opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/opencl.h
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/opencl.h
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/opencl.h
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/openfabrics-verbs.h b/opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/openfabrics-verbs.h
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/openfabrics-verbs.h
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/openfabrics-verbs.h
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/plugins.h b/opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/plugins.h
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/plugins.h
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/plugins.h
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/rename.h b/opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/rename.h
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/include/hwloc/rename.h
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/include/hwloc/rename.h
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/include/private/autogen/config.h.in b/opal/mca/hwlocxxx/hwloc1113/hwloc/include/private/autogen/config.h.in
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/include/private/autogen/config.h.in
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/include/private/autogen/config.h.in
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/include/private/components.h b/opal/mca/hwlocxxx/hwloc1113/hwloc/include/private/components.h
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/include/private/components.h
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/include/private/components.h
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/include/private/cpuid-x86.h b/opal/mca/hwlocxxx/hwloc1113/hwloc/include/private/cpuid-x86.h
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/include/private/cpuid-x86.h
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/include/private/cpuid-x86.h
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/include/private/debug.h b/opal/mca/hwlocxxx/hwloc1113/hwloc/include/private/debug.h
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/include/private/debug.h
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/include/private/debug.h
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/include/private/misc.h b/opal/mca/hwlocxxx/hwloc1113/hwloc/include/private/misc.h
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/include/private/misc.h
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/include/private/misc.h
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/include/private/private.h b/opal/mca/hwlocxxx/hwloc1113/hwloc/include/private/private.h
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/include/private/private.h
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/include/private/private.h
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/include/private/solaris-chiptype.h b/opal/mca/hwlocxxx/hwloc1113/hwloc/include/private/solaris-chiptype.h
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/include/private/solaris-chiptype.h
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/include/private/solaris-chiptype.h
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/include/private/xml.h b/opal/mca/hwlocxxx/hwloc1113/hwloc/include/private/xml.h
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/include/private/xml.h
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/include/private/xml.h
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/Makefile.am b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/Makefile.am
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/Makefile.am
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/Makefile.am
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/base64.c b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/base64.c
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/base64.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/base64.c
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/bind.c b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/bind.c
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/bind.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/bind.c
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/bitmap.c b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/bitmap.c
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/bitmap.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/bitmap.c
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/components.c b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/components.c
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/components.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/components.c
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/diff.c b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/diff.c
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/diff.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/diff.c
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/distances.c b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/distances.c
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/distances.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/distances.c
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/dolib.c b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/dolib.c
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/dolib.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/dolib.c
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/hwloc.dtd b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/hwloc.dtd
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/hwloc.dtd
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/hwloc.dtd
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/misc.c b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/misc.c
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/misc.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/misc.c
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/pci-common.c b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/pci-common.c
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/pci-common.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/pci-common.c
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/topology-aix.c b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-aix.c
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/topology-aix.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-aix.c
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/topology-bgq.c b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-bgq.c
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/topology-bgq.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-bgq.c
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/topology-cuda.c b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-cuda.c
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/topology-cuda.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-cuda.c
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/topology-custom.c b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-custom.c
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/topology-custom.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-custom.c
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/topology-darwin.c b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-darwin.c
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/topology-darwin.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-darwin.c
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/topology-fake.c b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-fake.c
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/topology-fake.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-fake.c
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/topology-freebsd.c b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-freebsd.c
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/topology-freebsd.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-freebsd.c
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/topology-gl.c b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-gl.c
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/topology-gl.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-gl.c
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/topology-hardwired.c b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-hardwired.c
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/topology-hardwired.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-hardwired.c
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/topology-hpux.c b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-hpux.c
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/topology-hpux.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-hpux.c
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/topology-linux.c b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-linux.c
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/topology-linux.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-linux.c
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/topology-netbsd.c b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-netbsd.c
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/topology-netbsd.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-netbsd.c
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/topology-noos.c b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-noos.c
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/topology-noos.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-noos.c
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/topology-nvml.c b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-nvml.c
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/topology-nvml.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-nvml.c
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/topology-opencl.c b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-opencl.c
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/topology-opencl.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-opencl.c
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/topology-osf.c b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-osf.c
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/topology-osf.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-osf.c
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/topology-pci.c b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-pci.c
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/topology-pci.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-pci.c
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/topology-solaris-chiptype.c b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-solaris-chiptype.c
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/topology-solaris-chiptype.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-solaris-chiptype.c
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/topology-solaris.c b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-solaris.c
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/topology-solaris.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-solaris.c
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/topology-synthetic.c b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-synthetic.c
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/topology-synthetic.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-synthetic.c
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/topology-windows.c b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-windows.c
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/topology-windows.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-windows.c
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/topology-x86.c b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-x86.c
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/topology-x86.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-x86.c
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/topology-xml-libxml.c b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-xml-libxml.c
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/topology-xml-libxml.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-xml-libxml.c
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/topology-xml-nolibxml.c b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-xml-nolibxml.c
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/topology-xml-nolibxml.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-xml-nolibxml.c
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/topology-xml.c b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-xml.c
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/topology-xml.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology-xml.c
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/topology.c b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology.c
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/topology.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/topology.c
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/src/traversal.c b/opal/mca/hwlocxxx/hwloc1113/hwloc/src/traversal.c
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/src/traversal.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/src/traversal.c
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/tests/README.txt b/opal/mca/hwlocxxx/hwloc1113/hwloc/tests/README.txt
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/tests/README.txt
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/tests/README.txt
diff --git a/opal/mca/hwloc/hwloc1113/hwloc/utils/README.txt b/opal/mca/hwlocxxx/hwloc1113/hwloc/utils/README.txt
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc/utils/README.txt
rename to opal/mca/hwlocxxx/hwloc1113/hwloc/utils/README.txt
diff --git a/opal/mca/hwloc/hwloc1113/hwloc1113.h b/opal/mca/hwlocxxx/hwloc1113/hwloc1113.h
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/hwloc1113.h
rename to opal/mca/hwlocxxx/hwloc1113/hwloc1113.h
diff --git a/opal/mca/hwloc/hwloc1113/hwloc1113_component.c b/opal/mca/hwlocxxx/hwloc1113/hwloc1113_component.c
similarity index 79%
rename from opal/mca/hwloc/hwloc1113/hwloc1113_component.c
rename to opal/mca/hwlocxxx/hwloc1113/hwloc1113_component.c
index a402d675c4e..9893f563e1f 100644
--- a/opal/mca/hwloc/hwloc1113/hwloc1113_component.c
+++ b/opal/mca/hwlocxxx/hwloc1113/hwloc1113_component.c
@@ -4,7 +4,8 @@
  * Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
  * Copyright (c) 2015-2016 Los Alamos National Security, LLC. All rights
  *                         reserved.
- *
+ * Copyright (c) 2017      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -21,21 +22,21 @@
 #include "opal_config.h"
 #include "opal/constants.h"
 
-#include "opal/mca/hwloc/hwloc.h"
+#include "opal/mca/hwlocxxx/hwlocxxx.h"
 #include "hwloc1113.h"
 
 /*
  * Public string showing the sysinfo ompi_linux component version number
  */
-const char *opal_hwloc_hwloc1113_component_version_string =
-    "OPAL hwloc1113 hwloc MCA component version " OPAL_VERSION;
+const char *opal_hwlocxxx_hwloc1113_component_version_string =
+    "OPAL hwloc1113 hwlocxxx MCA component version " OPAL_VERSION;
 
 /*
  * Instantiate the public struct with all of our public information
  * and pointers to our public functions in it
  */
 
-const opal_hwloc_component_t mca_hwloc_hwloc1113_component = {
+const opal_hwloc_component_t mca_hwlocxxx_hwloc1113_component = {
 
     /* First, the mca_component_t struct containing meta information
        about the component itself */
diff --git a/opal/mca/hwloc/hwloc1113/owner.txt b/opal/mca/hwlocxxx/hwloc1113/owner.txt
similarity index 100%
rename from opal/mca/hwloc/hwloc1113/owner.txt
rename to opal/mca/hwlocxxx/hwloc1113/owner.txt
diff --git a/opal/mca/hwloc/hwloc.h b/opal/mca/hwlocxxx/hwlocxxx.h
similarity index 100%
rename from opal/mca/hwloc/hwloc.h
rename to opal/mca/hwlocxxx/hwlocxxx.h
diff --git a/opal/mca/pmix/cray/pmix_cray.c b/opal/mca/pmix/cray/pmix_cray.c
index 31bf7a59b1e..a252637f49d 100644
--- a/opal/mca/pmix/cray/pmix_cray.c
+++ b/opal/mca/pmix/cray/pmix_cray.c
@@ -6,7 +6,7 @@
  * Copyright (c) 2011-2016 Los Alamos National Security, LLC. All
  *                         rights reserved.
  * Copyright (c) 2013-2015 Intel, Inc.  All rights reserved.
- * Copyright (c) 2014-2016 Research Organization for Information Science
+ * Copyright (c) 2014-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
@@ -19,7 +19,7 @@
 #include "opal/constants.h"
 #include "opal/types.h"
 #include "opal_stdint.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/util/argv.h"
 #include "opal/util/opal_environ.h"
 #include "opal/util/output.h"
diff --git a/opal/mca/pmix/ext1x/pmix1x.c b/opal/mca/pmix/ext1x/pmix1x.c
index c255962d158..b7ac2094d7d 100644
--- a/opal/mca/pmix/ext1x/pmix1x.c
+++ b/opal/mca/pmix/ext1x/pmix1x.c
@@ -26,7 +26,7 @@
 
 #include "opal/dss/dss.h"
 #include "opal/mca/event/event.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/runtime/opal.h"
 #include "opal/runtime/opal_progress_threads.h"
 #include "opal/util/argv.h"
diff --git a/opal/mca/pmix/ext1x/pmix1x_server_north.c b/opal/mca/pmix/ext1x/pmix1x_server_north.c
index 2263813c640..ffdef0a803c 100644
--- a/opal/mca/pmix/ext1x/pmix1x_server_north.c
+++ b/opal/mca/pmix/ext1x/pmix1x_server_north.c
@@ -26,7 +26,7 @@
 
 #include "opal/dss/dss.h"
 #include "opal/mca/event/event.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/runtime/opal.h"
 #include "opal/runtime/opal_progress_threads.h"
 #include "opal/util/argv.h"
diff --git a/opal/mca/pmix/ext1x/pmix1x_server_south.c b/opal/mca/pmix/ext1x/pmix1x_server_south.c
index 2117c58a672..1b4890166b3 100644
--- a/opal/mca/pmix/ext1x/pmix1x_server_south.c
+++ b/opal/mca/pmix/ext1x/pmix1x_server_south.c
@@ -27,7 +27,7 @@
 
 #include "opal/dss/dss.h"
 #include "opal/mca/event/event.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/runtime/opal.h"
 #include "opal/runtime/opal_progress_threads.h"
 #include "opal/util/argv.h"
diff --git a/opal/mca/pmix/ext2x/pmix2x.c b/opal/mca/pmix/ext2x/pmix2x.c
index bb6d37d5240..8e920d06ecb 100644
--- a/opal/mca/pmix/ext2x/pmix2x.c
+++ b/opal/mca/pmix/ext2x/pmix2x.c
@@ -26,7 +26,7 @@
 
 #include "opal/dss/dss.h"
 #include "opal/mca/event/event.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/runtime/opal.h"
 #include "opal/runtime/opal_progress_threads.h"
 #include "opal/util/argv.h"
diff --git a/opal/mca/pmix/ext2x/pmix2x_server_north.c b/opal/mca/pmix/ext2x/pmix2x_server_north.c
index df23ab27203..5fc28de30ac 100644
--- a/opal/mca/pmix/ext2x/pmix2x_server_north.c
+++ b/opal/mca/pmix/ext2x/pmix2x_server_north.c
@@ -26,7 +26,7 @@
 
 #include "opal/dss/dss.h"
 #include "opal/mca/event/event.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/runtime/opal.h"
 #include "opal/runtime/opal_progress_threads.h"
 #include "opal/util/argv.h"
diff --git a/opal/mca/pmix/ext2x/pmix2x_server_south.c b/opal/mca/pmix/ext2x/pmix2x_server_south.c
index 187fb81394a..151bb8819d0 100644
--- a/opal/mca/pmix/ext2x/pmix2x_server_south.c
+++ b/opal/mca/pmix/ext2x/pmix2x_server_south.c
@@ -27,7 +27,7 @@
 
 #include "opal/dss/dss.h"
 #include "opal/mca/event/event.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/runtime/opal.h"
 #include "opal/runtime/opal_progress_threads.h"
 #include "opal/util/argv.h"
diff --git a/opal/mca/pmix/flux/pmix_flux.c b/opal/mca/pmix/flux/pmix_flux.c
index a110962bf7c..9fc69034ca1 100644
--- a/opal/mca/pmix/flux/pmix_flux.c
+++ b/opal/mca/pmix/flux/pmix_flux.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
 /*
  * Copyright (c) 2014-2016 Intel, Inc.  All rights reserved.
- * Copyright (c) 2014-2016 Research Organization for Information Science
+ * Copyright (c) 2014-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2016 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
@@ -16,7 +16,7 @@
 #include "opal/types.h"
 
 #include "opal_stdint.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/util/argv.h"
 #include "opal/util/opal_environ.h"
 #include "opal/util/output.h"
diff --git a/opal/mca/pmix/isolated/pmix_isolated.c b/opal/mca/pmix/isolated/pmix_isolated.c
index 08860ef895f..6373f583b19 100644
--- a/opal/mca/pmix/isolated/pmix_isolated.c
+++ b/opal/mca/pmix/isolated/pmix_isolated.c
@@ -4,6 +4,8 @@
  * Copyright (c) 2011-2015 Los Alamos National Security, LLC. All
  *                         rights reserved.
  * Copyright (c) 2016 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2017      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -24,7 +26,7 @@
 
 #include "opal/dss/dss.h"
 #include "opal/mca/event/event.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/runtime/opal.h"
 #include "opal/runtime/opal_progress_threads.h"
 #include "opal/util/argv.h"
diff --git a/opal/mca/pmix/pmix2x/pmix2x.c b/opal/mca/pmix/pmix2x/pmix2x.c
index 10f6a5e7725..47dc2403e27 100644
--- a/opal/mca/pmix/pmix2x/pmix2x.c
+++ b/opal/mca/pmix/pmix2x/pmix2x.c
@@ -26,7 +26,7 @@
 
 #include "opal/dss/dss.h"
 #include "opal/mca/event/event.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/runtime/opal.h"
 #include "opal/runtime/opal_progress_threads.h"
 #include "opal/util/argv.h"
diff --git a/opal/mca/pmix/pmix2x/pmix2x_server_north.c b/opal/mca/pmix/pmix2x/pmix2x_server_north.c
index c08cdf27eab..3adbaa5add0 100644
--- a/opal/mca/pmix/pmix2x/pmix2x_server_north.c
+++ b/opal/mca/pmix/pmix2x/pmix2x_server_north.c
@@ -26,7 +26,7 @@
 
 #include "opal/dss/dss.h"
 #include "opal/mca/event/event.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/runtime/opal.h"
 #include "opal/runtime/opal_progress_threads.h"
 #include "opal/util/argv.h"
diff --git a/opal/mca/pmix/pmix2x/pmix2x_server_south.c b/opal/mca/pmix/pmix2x/pmix2x_server_south.c
index e1195da202a..0ae19686dee 100644
--- a/opal/mca/pmix/pmix2x/pmix2x_server_south.c
+++ b/opal/mca/pmix/pmix2x/pmix2x_server_south.c
@@ -27,7 +27,7 @@
 
 #include "opal/dss/dss.h"
 #include "opal/mca/event/event.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/runtime/opal.h"
 #include "opal/runtime/opal_progress_threads.h"
 #include "opal/util/argv.h"
diff --git a/opal/mca/pmix/s1/pmix_s1.c b/opal/mca/pmix/s1/pmix_s1.c
index fdec5ec729e..50e5b5da2e9 100644
--- a/opal/mca/pmix/s1/pmix_s1.c
+++ b/opal/mca/pmix/s1/pmix_s1.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
 /*
  * Copyright (c) 2014-2016 Intel, Inc.  All rights reserved.
- * Copyright (c) 2014-2016 Research Organization for Information Science
+ * Copyright (c) 2014-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2016 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
@@ -16,7 +16,7 @@
 #include "opal/types.h"
 
 #include "opal_stdint.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/util/argv.h"
 #include "opal/util/opal_environ.h"
 #include "opal/util/output.h"
diff --git a/opal/mca/pmix/s2/pmix_s2.c b/opal/mca/pmix/s2/pmix_s2.c
index c4e2e8005a2..0bf22e75fa6 100644
--- a/opal/mca/pmix/s2/pmix_s2.c
+++ b/opal/mca/pmix/s2/pmix_s2.c
@@ -6,7 +6,7 @@
  * Copyright (c) 2011-2013 Los Alamos National Security, LLC. All
  *                         rights reserved.
  * Copyright (c) 2013-2016 Intel, Inc.  All rights reserved.
- * Copyright (c) 2014-2016 Research Organization for Information Science
+ * Copyright (c) 2014-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
@@ -20,7 +20,7 @@
 #include "opal/types.h"
 
 #include "opal_stdint.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/util/argv.h"
 #include "opal/util/opal_environ.h"
 #include "opal/util/output.h"
diff --git a/opal/runtime/opal_finalize.c b/opal/runtime/opal_finalize.c
index 4719e1a011d..35400d9f85f 100644
--- a/opal/runtime/opal_finalize.c
+++ b/opal/runtime/opal_finalize.c
@@ -45,7 +45,7 @@
 #include "opal/mca/backtrace/base/base.h"
 #include "opal/mca/sec/base/base.h"
 #include "opal/mca/timer/base/base.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/mca/event/base/base.h"
 #include "opal/runtime/opal_progress.h"
 #include "opal/mca/shmem/base/base.h"
@@ -152,8 +152,8 @@ opal_finalize(void)
     /* finalize the memory manager / tracker */
     opal_mem_hooks_finalize();
 
-    /* close the hwloc framework */
-    (void) mca_base_framework_close(&opal_hwloc_base_framework);
+    /* close the hwlocxxx framework */
+    (void) mca_base_framework_close(&opal_hwlocxxx_base_framework);
 
     /* close the shmem framework */
     (void) mca_base_framework_close(&opal_shmem_base_framework);
diff --git a/opal/runtime/opal_init.c b/opal/runtime/opal_init.c
index 28e0ef92a9f..2846e39c922 100644
--- a/opal/runtime/opal_init.c
+++ b/opal/runtime/opal_init.c
@@ -48,7 +48,7 @@
 #include "opal/mca/memory/base/base.h"
 #include "opal/mca/patcher/base/base.h"
 #include "opal/mca/memcpy/base/base.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/mca/sec/base/base.h"
 #include "opal/mca/timer/base/base.h"
 #include "opal/mca/memchecker/base/base.h"
@@ -493,8 +493,8 @@ opal_init(int* pargc, char*** pargv)
     /* open hwloc - since this is a static framework, no
      * select is required
      */
-    if (OPAL_SUCCESS != (ret = mca_base_framework_open(&opal_hwloc_base_framework, 0))) {
-        error = "opal_hwloc_base_open";
+    if (OPAL_SUCCESS != (ret = mca_base_framework_open(&opal_hwlocxxx_base_framework, 0))) {
+        error = "opal_hwlocxxx_base_open";
         goto return_error;
     }
 
diff --git a/opal/util/proc.h b/opal/util/proc.h
index 15d37a1063f..cad3a7ac84e 100644
--- a/opal/util/proc.h
+++ b/opal/util/proc.h
@@ -4,7 +4,7 @@
  *                         reserved.
  * Copyright (c) 2013      Inria.  All rights reserved.
  * Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
- * Copyright (c) 2014-2016 Research Organization for Information Science
+ * Copyright (c) 2014-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
@@ -18,7 +18,7 @@
 
 #include "opal_config.h"
 #include "opal/class/opal_list.h"
-#include "opal/mca/hwloc/hwloc.h"
+#include "opal/mca/hwlocxxx/hwlocxxx.h"
 #include "opal/types.h"
 #include "opal/dss/dss.h"
 
diff --git a/orte/mca/ess/base/ess_base_fns.c b/orte/mca/ess/base/ess_base_fns.c
index f40814ef5b5..56ecc3b85b4 100644
--- a/orte/mca/ess/base/ess_base_fns.c
+++ b/orte/mca/ess/base/ess_base_fns.c
@@ -13,7 +13,7 @@
  * Copyright (c) 2011-2012 Los Alamos National Security, LLC.
  *                         All rights reserved.
  * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
- * Copyright (c) 2014      Research Organization for Information Science
+ * Copyright (c) 2014 -2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
@@ -33,7 +33,7 @@
 
 #include "opal/util/output.h"
 #include "opal/mca/pmix/pmix.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 
 #include "orte/mca/errmgr/errmgr.h"
 #include "orte/util/name_fns.h"
diff --git a/orte/mca/ess/base/ess_base_std_orted.c b/orte/mca/ess/base/ess_base_std_orted.c
index a1a277aad3f..aea8d277f76 100644
--- a/orte/mca/ess/base/ess_base_std_orted.c
+++ b/orte/mca/ess/base/ess_base_std_orted.c
@@ -15,6 +15,8 @@
  * Copyright (c) 2011-2013 Los Alamos National Security, LLC.  All rights
  *                         reserved.
  * Copyright (c) 2013-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
@@ -38,7 +40,7 @@
 #include "opal/mca/event/event.h"
 #include "opal/runtime/opal.h"
 #include "opal/runtime/opal_cr.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/mca/pmix/base/base.h"
 #include "opal/mca/pstat/base/base.h"
 #include "opal/util/arch.h"
diff --git a/orte/mca/ess/ess.h b/orte/mca/ess/ess.h
index 34c2dd6324c..872d9962bc1 100644
--- a/orte/mca/ess/ess.h
+++ b/orte/mca/ess/ess.h
@@ -12,7 +12,9 @@
  *                         All rights reserved.
  * Copyright (c) 2011-2015 Los Alamos National Security, LLC.  All rights
  *                         reserved.
- * Copyright (c) 2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2012      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2017      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -32,7 +34,7 @@
 #include "orte/types.h"
 
 #include "orte/mca/mca.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 
 #include "orte/util/proc_info.h"
 #include "orte/runtime/runtime.h"
diff --git a/orte/mca/ess/hnp/ess_hnp_module.c b/orte/mca/ess/hnp/ess_hnp_module.c
index 3dbf527e2ab..8061ccf2105 100644
--- a/orte/mca/ess/hnp/ess_hnp_module.c
+++ b/orte/mca/ess/hnp/ess_hnp_module.c
@@ -15,7 +15,7 @@
  * Copyright (c) 2011-2017 Los Alamos National Security, LLC.  All rights
  *                         reserved.
  * Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
- * Copyright (c) 2017      Research Organization for Information Science
+ * Copyright (c) 2017 -2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
@@ -54,7 +54,7 @@
 #include "opal/util/fd.h"
 #include "opal/mca/pmix/base/base.h"
 #include "opal/mca/pstat/base/base.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 
 #include "orte/mca/oob/base/base.h"
 #include "orte/mca/rml/base/base.h"
diff --git a/orte/mca/ess/pmi/ess_pmi_module.c b/orte/mca/ess/pmi/ess_pmi_module.c
index 6ed504f3413..b4d14370d27 100644
--- a/orte/mca/ess/pmi/ess_pmi_module.c
+++ b/orte/mca/ess/pmi/ess_pmi_module.c
@@ -43,7 +43,7 @@
 #include "opal/util/argv.h"
 #include "opal/runtime/opal_progress_threads.h"
 #include "opal/class/opal_pointer_array.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/util/printf.h"
 #include "opal/util/proc.h"
 #include "opal/mca/pmix/pmix.h"
diff --git a/orte/mca/grpcomm/base/base.h b/orte/mca/grpcomm/base/base.h
index 3033d73b249..37f6ce27a61 100644
--- a/orte/mca/grpcomm/base/base.h
+++ b/orte/mca/grpcomm/base/base.h
@@ -12,6 +12,8 @@
  * Copyright (c) 2011-2013 Los Alamos National Security, LLC.
  *                         All rights reserved.
  * Copyright (c) 2013-2016 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2017      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -33,7 +35,7 @@
 #include "opal/class/opal_hash_table.h"
 #include "opal/dss/dss_types.h"
 #include "orte/mca/mca.h"
-#include "opal/mca/hwloc/hwloc.h"
+#include "opal/mca/hwlocxxx/hwlocxxx.h"
 
 #include "orte/mca/odls/odls_types.h"
 #include "orte/mca/rml/rml_types.h"
diff --git a/orte/mca/odls/alps/odls_alps_module.c b/orte/mca/odls/alps/odls_alps_module.c
index 2f6e1f6d819..4358807834d 100644
--- a/orte/mca/odls/alps/odls_alps_module.c
+++ b/orte/mca/odls/alps/odls_alps_module.c
@@ -16,6 +16,8 @@
  * Copyright (c) 2011-2014 Los Alamos National Security, LLC.  All rights
  *                         reserved.
  * Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+ * Copyright (c) 2017      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  *
  * $COPYRIGHT$
  *
@@ -106,8 +108,8 @@
 #endif
 
 
-#include "opal/mca/hwloc/hwloc.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/hwlocxxx.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/class/opal_pointer_array.h"
 #include "opal/util/opal_environ.h"
 #include "opal/util/show_help.h"
diff --git a/orte/mca/odls/base/odls_base_default_fns.c b/orte/mca/odls/base/odls_base_default_fns.c
index 6d699a4d2f7..3aa2813e33b 100644
--- a/orte/mca/odls/base/odls_base_default_fns.c
+++ b/orte/mca/odls/base/odls_base_default_fns.c
@@ -15,7 +15,7 @@
  *                         All rights reserved.
  * Copyright (c) 2011-2013 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
- * Copyright (c) 2014      Research Organization for Information Science
+ * Copyright (c) 2014 -2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2017      Mellanox Technologies Ltd. All rights reserved.
  * $COPYRIGHT$
@@ -52,7 +52,7 @@
 #include "opal/util/path.h"
 #include "opal/util/sys_limits.h"
 #include "opal/dss/dss.h"
-#include "opal/mca/hwloc/hwloc.h"
+#include "opal/mca/hwlocxxx/hwlocxxx.h"
 #include "opal/mca/shmem/base/base.h"
 #include "opal/mca/pstat/pstat.h"
 #include "opal/mca/pmix/pmix.h"
diff --git a/orte/mca/odls/base/odls_base_frame.c b/orte/mca/odls/base/odls_base_frame.c
index e615433957b..0e79e649f8a 100644
--- a/orte/mca/odls/base/odls_base_frame.c
+++ b/orte/mca/odls/base/odls_base_frame.c
@@ -13,7 +13,7 @@
  * Copyright (c) 2011      Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2011-2013 Los Alamos National Security, LLC.
  *                         All rights reserved.
- * Copyright (c) 2014-2015 Research Organization for Information Science
+ * Copyright (c) 2014-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
@@ -31,7 +31,7 @@
 #include "opal/class/opal_ring_buffer.h"
 #include "orte/mca/mca.h"
 #include "opal/mca/base/base.h"
-#include "opal/mca/hwloc/hwloc.h"
+#include "opal/mca/hwlocxxx/hwlocxxx.h"
 #include "opal/util/output.h"
 #include "opal/util/path.h"
 #include "opal/util/argv.h"
diff --git a/orte/mca/odls/default/odls_default_module.c b/orte/mca/odls/default/odls_default_module.c
index 7c121020503..be8cd09ef03 100644
--- a/orte/mca/odls/default/odls_default_module.c
+++ b/orte/mca/odls/default/odls_default_module.c
@@ -16,6 +16,8 @@
  * Copyright (c) 2011-2013 Los Alamos National Security, LLC.  All rights
  *                         reserved.
  * Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+ * Copyright (c) 2017      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  *
  * $COPYRIGHT$
  *
@@ -106,8 +108,8 @@
 #endif
 #include <ctype.h>
 
-#include "opal/mca/hwloc/hwloc.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/hwlocxxx.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/class/opal_pointer_array.h"
 #include "opal/util/opal_environ.h"
 #include "opal/util/show_help.h"
diff --git a/orte/mca/plm/base/plm_base_launch_support.c b/orte/mca/plm/base/plm_base_launch_support.c
index a9927cf4277..fbc61b6e2c5 100644
--- a/orte/mca/plm/base/plm_base_launch_support.c
+++ b/orte/mca/plm/base/plm_base_launch_support.c
@@ -14,7 +14,7 @@
  *                         et Automatique. All rights reserved.
  * Copyright (c) 2011-2012 Los Alamos National Security, LLC.
  * Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
- * Copyright (c) 2014-2016 Research Organization for Information Science
+ * Copyright (c) 2014-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2016      IBM Corporation.  All rights reserved.
  * $COPYRIGHT$
@@ -40,7 +40,7 @@
 #include "opal/util/argv.h"
 #include "opal/class/opal_pointer_array.h"
 #include "opal/dss/dss.h"
-#include "opal/mca/hwloc/hwloc.h"
+#include "opal/mca/hwlocxxx/hwlocxxx.h"
 
 #include "orte/util/dash_host/dash_host.h"
 #include "orte/util/session_dir.h"
diff --git a/orte/mca/ras/lsf/ras_lsf_module.c b/orte/mca/ras/lsf/ras_lsf_module.c
index 2aae886256a..6cfc1a6ec53 100644
--- a/orte/mca/ras/lsf/ras_lsf_module.c
+++ b/orte/mca/ras/lsf/ras_lsf_module.c
@@ -12,6 +12,8 @@
  * Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2014      Intel, Inc. All rights reserved
  * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * Copyright (c) 2017      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -32,7 +34,7 @@
 
 #include "opal/util/argv.h"
 #include "opal/util/net.h"
-#include "opal/mca/hwloc/hwloc.h"
+#include "opal/mca/hwlocxxx/hwlocxxx.h"
 
 #include "orte/mca/rmaps/rmaps_types.h"
 #include "orte/mca/errmgr/errmgr.h"
diff --git a/orte/mca/ras/simulator/ras_sim_module.c b/orte/mca/ras/simulator/ras_sim_module.c
index ddeb153a568..3efe17bfacd 100644
--- a/orte/mca/ras/simulator/ras_sim_module.c
+++ b/orte/mca/ras/simulator/ras_sim_module.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2011      Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2012      Los Alamos National Security, LLC. All rights reserved
- * Copyright (c) 2015      Research Organization for Information Science
+ * Copyright (c) 2015 -2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2015-2017 Intel, Inc.  All rights reserved.
  *
@@ -20,7 +20,7 @@
 #include <ctype.h>
 
 #include "opal/class/opal_list.h"
-#include "opal/mca/hwloc/hwloc.h"
+#include "opal/mca/hwlocxxx/hwlocxxx.h"
 #include "opal/util/argv.h"
 
 #include "orte/util/show_help.h"
diff --git a/orte/mca/rmaps/base/rmaps_base_binding.c b/orte/mca/rmaps/base/rmaps_base_binding.c
index 484ddaa66c8..6b40c4cb2a5 100644
--- a/orte/mca/rmaps/base/rmaps_base_binding.c
+++ b/orte/mca/rmaps/base/rmaps_base_binding.c
@@ -13,7 +13,7 @@
  * Copyright (c) 2011-2012 Los Alamos National Security, LLC.
  *                         All rights reserved.
  * Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
- * Copyright (c) 2015      Research Organization for Information Science
+ * Copyright (c) 2015 -2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
@@ -35,7 +35,7 @@
 #include "opal/util/output.h"
 #include "orte/mca/mca.h"
 #include "opal/mca/base/base.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/threads/tsd.h"
 
 #include "orte/types.h"
diff --git a/orte/mca/rmaps/base/rmaps_base_map_job.c b/orte/mca/rmaps/base/rmaps_base_map_job.c
index b7cfcd7cc75..01b9410f646 100644
--- a/orte/mca/rmaps/base/rmaps_base_map_job.c
+++ b/orte/mca/rmaps/base/rmaps_base_map_job.c
@@ -13,7 +13,7 @@
  * Copyright (c) 2011-2012 Los Alamos National Security, LLC.
  *                         All rights reserved.
  * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
- * Copyright (c) 2016      Research Organization for Information Science
+ * Copyright (c) 2016 -2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
@@ -30,7 +30,7 @@
 #include "orte/mca/mca.h"
 #include "opal/util/output.h"
 #include "opal/mca/base/base.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/dss/dss.h"
 
 #include "orte/mca/errmgr/errmgr.h"
diff --git a/orte/mca/rmaps/base/rmaps_base_print_fns.c b/orte/mca/rmaps/base/rmaps_base_print_fns.c
index 1c6a15466ee..35fd9741d9f 100644
--- a/orte/mca/rmaps/base/rmaps_base_print_fns.c
+++ b/orte/mca/rmaps/base/rmaps_base_print_fns.c
@@ -10,6 +10,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2011      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2017      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -30,7 +32,7 @@
 #include "opal/util/output.h"
 #include "orte/mca/mca.h"
 #include "opal/mca/base/base.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/threads/tsd.h"
 
 #include "orte/types.h"
diff --git a/orte/mca/rmaps/base/rmaps_base_ranking.c b/orte/mca/rmaps/base/rmaps_base_ranking.c
index b297290a4d6..43bf0f35e2d 100644
--- a/orte/mca/rmaps/base/rmaps_base_ranking.c
+++ b/orte/mca/rmaps/base/rmaps_base_ranking.c
@@ -11,6 +11,8 @@
  *                         All rights reserved.
  * Copyright (c) 2011      Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2014-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
@@ -32,7 +34,7 @@
 #include "opal/util/output.h"
 #include "orte/mca/mca.h"
 #include "opal/mca/base/base.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/threads/tsd.h"
 
 #include "orte/types.h"
diff --git a/orte/mca/rmaps/base/rmaps_base_support_fns.c b/orte/mca/rmaps/base/rmaps_base_support_fns.c
index 2b1a1ccdc35..105c1116988 100644
--- a/orte/mca/rmaps/base/rmaps_base_support_fns.c
+++ b/orte/mca/rmaps/base/rmaps_base_support_fns.c
@@ -14,6 +14,8 @@
  *                         All rights reserved.
  * Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
  * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * Copyright (c) 2017      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -35,7 +37,7 @@
 #include "opal/util/output.h"
 #include "orte/mca/mca.h"
 #include "opal/mca/base/base.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/threads/tsd.h"
 
 #include "orte/types.h"
diff --git a/orte/mca/rmaps/lama/rmaps_lama_module.c b/orte/mca/rmaps/lama/rmaps_lama_module.c
index 5a1c20b1217..5886633cc64 100644
--- a/orte/mca/rmaps/lama/rmaps_lama_module.c
+++ b/orte/mca/rmaps/lama/rmaps_lama_module.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2012-2013 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2014      Intel, Inc. All rights reserved
- * Copyright (c) 2015      Research Organization for Information Science
+ * Copyright (c) 2015 -2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
@@ -22,7 +22,7 @@
 #endif  /* HAVE_UNISTD_H */
 #include <string.h>
 
-#include "opal/mca/hwloc/hwloc.h"
+#include "opal/mca/hwlocxxx/hwlocxxx.h"
 
 #include "opal/util/argv.h"
 #include "opal/class/opal_tree.h"
diff --git a/orte/mca/rmaps/mindist/rmaps_mindist.h b/orte/mca/rmaps/mindist/rmaps_mindist.h
index e437915bd9d..72df6e6e1d6 100644
--- a/orte/mca/rmaps/mindist/rmaps_mindist.h
+++ b/orte/mca/rmaps/mindist/rmaps_mindist.h
@@ -10,6 +10,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2013      Los Alamos National Security, LLC.  All rights reserved.
+ * Copyright (c) 2017      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -26,7 +28,7 @@
 
 #include "orte_config.h"
 
-#include "opal/mca/hwloc/hwloc.h"
+#include "opal/mca/hwlocxxx/hwlocxxx.h"
 #include "opal/class/opal_list.h"
 
 #include "orte/mca/rmaps/rmaps.h"
diff --git a/orte/mca/rmaps/ppr/rmaps_ppr.c b/orte/mca/rmaps/ppr/rmaps_ppr.c
index 7af292d308e..4be63ab2756 100644
--- a/orte/mca/rmaps/ppr/rmaps_ppr.c
+++ b/orte/mca/rmaps/ppr/rmaps_ppr.c
@@ -3,7 +3,7 @@
  * Copyright (c) 2011      Los Alamos National Security, LLC.
  *                         All rights reserved.
  * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
- * Copyright (c) 2015      Research Organization for Information Science
+ * Copyright (c) 2015 -2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
@@ -22,7 +22,7 @@
 #endif  /* HAVE_UNISTD_H */
 #include <string.h>
 
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/util/argv.h"
 
 #include "orte/util/show_help.h"
diff --git a/orte/mca/rmaps/ppr/rmaps_ppr.h b/orte/mca/rmaps/ppr/rmaps_ppr.h
index 866ee148c0d..359dbcfa2f6 100644
--- a/orte/mca/rmaps/ppr/rmaps_ppr.h
+++ b/orte/mca/rmaps/ppr/rmaps_ppr.h
@@ -1,5 +1,7 @@
 /*
  * Copyright (c) 2011      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2017      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -12,7 +14,7 @@
 
 #include "orte_config.h"
 
-#include "opal/mca/hwloc/hwloc.h"
+#include "opal/mca/hwlocxxx/hwlocxxx.h"
 
 #include "orte/mca/rmaps/rmaps.h"
 
diff --git a/orte/mca/rmaps/rank_file/rmaps_rank_file.c b/orte/mca/rmaps/rank_file/rmaps_rank_file.c
index 26d19f6881e..499d7664edc 100644
--- a/orte/mca/rmaps/rank_file/rmaps_rank_file.c
+++ b/orte/mca/rmaps/rank_file/rmaps_rank_file.c
@@ -15,7 +15,7 @@
  * Copyright (c) 2008      Voltaire. All rights reserved
  * Copyright (c) 2010      Oracle and/or its affiliates.  All rights reserved.
  * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
- * Copyright (c) 2015      Research Organization for Information Science
+ * Copyright (c) 2015 -2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2016      IBM Corporation.  All rights reserved.
  *
@@ -40,7 +40,7 @@
 #include "opal/util/if.h"
 #include "opal/util/net.h"
 #include "opal/class/opal_pointer_array.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 
 #include "orte/mca/errmgr/errmgr.h"
 #include "orte/mca/ess/ess.h"
diff --git a/orte/mca/rmaps/rank_file/rmaps_rank_file_component.c b/orte/mca/rmaps/rank_file/rmaps_rank_file_component.c
index 623d85d16e4..b51c021f92a 100644
--- a/orte/mca/rmaps/rank_file/rmaps_rank_file_component.c
+++ b/orte/mca/rmaps/rank_file/rmaps_rank_file_component.c
@@ -15,6 +15,8 @@
  * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
  * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2017      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -28,7 +30,7 @@
 #include <string.h>
 
 #include "opal/mca/base/base.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 
 #include "orte/util/show_help.h"
 
diff --git a/orte/mca/rmaps/rmaps_types.h b/orte/mca/rmaps/rmaps_types.h
index b4a4c93af62..e71e2eebb88 100644
--- a/orte/mca/rmaps/rmaps_types.h
+++ b/orte/mca/rmaps/rmaps_types.h
@@ -13,6 +13,8 @@
  * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights
  *                         reserved.
  * Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
+ * Copyright (c) 2017      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -29,7 +31,7 @@
 #include "orte/constants.h"
 
 #include "opal/class/opal_pointer_array.h"
-#include "opal/mca/hwloc/hwloc.h"
+#include "opal/mca/hwlocxxx/hwlocxxx.h"
 
 #include "orte/runtime/orte_globals.h"
 
diff --git a/orte/mca/rmaps/round_robin/rmaps_rr.h b/orte/mca/rmaps/round_robin/rmaps_rr.h
index d406c1267be..63d562e0754 100644
--- a/orte/mca/rmaps/round_robin/rmaps_rr.h
+++ b/orte/mca/rmaps/round_robin/rmaps_rr.h
@@ -10,6 +10,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2015      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,7 +28,7 @@
 
 #include "orte_config.h"
 
-#include "opal/mca/hwloc/hwloc.h"
+#include "opal/mca/hwlocxxx/hwlocxxx.h"
 #include "opal/class/opal_list.h"
 
 #include "orte/mca/rmaps/rmaps.h"
diff --git a/orte/mca/rmaps/round_robin/rmaps_rr_mappers.c b/orte/mca/rmaps/round_robin/rmaps_rr_mappers.c
index a978ef9ebaa..22dba66f996 100644
--- a/orte/mca/rmaps/round_robin/rmaps_rr_mappers.c
+++ b/orte/mca/rmaps/round_robin/rmaps_rr_mappers.c
@@ -11,7 +11,7 @@
  *                         All rights reserved.
  * Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
- * Copyright (c) 2015      Research Organization for Information Science
+ * Copyright (c) 2015 -2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
@@ -26,7 +26,7 @@
 #include <string.h>
 
 #include "opal/util/output.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 
 #include "orte/util/show_help.h"
 #include "orte/util/name_fns.h"
diff --git a/orte/mca/rmaps/seq/rmaps_seq.c b/orte/mca/rmaps/seq/rmaps_seq.c
index 310fe622e0e..e3c178712b5 100644
--- a/orte/mca/rmaps/seq/rmaps_seq.c
+++ b/orte/mca/rmaps/seq/rmaps_seq.c
@@ -13,7 +13,7 @@
  * Copyright (c) 2011      Los Alamos National Security, LLC.
  *                         All rights reserved.
  * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
- * Copyright (c) 2015      Research Organization for Information Science
+ * Copyright (c) 2015 -2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2016      IBM Corporation.  All rights reserved.
  * $COPYRIGHT$
@@ -36,7 +36,7 @@
 
 #include "opal/util/if.h"
 #include "opal/util/net.h"
-#include "opal/mca/hwloc/hwloc.h"
+#include "opal/mca/hwlocxxx/hwlocxxx.h"
 
 #include "orte/util/show_help.h"
 #include "orte/mca/errmgr/errmgr.h"
diff --git a/orte/mca/rtc/hwloc/rtc_hwloc.c b/orte/mca/rtc/hwloc/rtc_hwloc.c
index 91cb18328bb..467b1925709 100644
--- a/orte/mca/rtc/hwloc/rtc_hwloc.c
+++ b/orte/mca/rtc/hwloc/rtc_hwloc.c
@@ -1,5 +1,7 @@
 /*
  * Copyright (c) 2014-2015 Intel, Inc. All rights reserved
+ * Copyright (c) 2017      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -17,7 +19,7 @@
 #endif  /* HAVE_UNISTD_H */
 #include <string.h>
 
-#include "opal/mca/hwloc/hwloc.h"
+#include "opal/mca/hwlocxxx/hwlocxxx.h"
 #include "opal/util/argv.h"
 #include "opal/util/opal_environ.h"
 
diff --git a/orte/orted/orted_main.c b/orte/orted/orted_main.c
index bd6b2cee602..e49d483afa0 100644
--- a/orte/orted/orted_main.c
+++ b/orte/orted/orted_main.c
@@ -65,7 +65,7 @@
 #include "opal/mca/base/mca_base_var.h"
 #include "opal/util/daemon_init.h"
 #include "opal/dss/dss.h"
-#include "opal/mca/hwloc/hwloc.h"
+#include "opal/mca/hwlocxxx/hwlocxxx.h"
 #include "opal/mca/pmix/pmix.h"
 
 #include "orte/util/show_help.h"
diff --git a/orte/orted/orted_submit.c b/orte/orted/orted_submit.c
index 365203bdeb6..805240fd805 100644
--- a/orte/orted/orted_submit.c
+++ b/orte/orted/orted_submit.c
@@ -61,7 +61,7 @@
 #include "opal/dss/dss.h"
 #include "opal/mca/event/event.h"
 #include "opal/mca/installdirs/installdirs.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/mca/base/base.h"
 #include "opal/mca/pmix/pmix.h"
 #include "opal/util/argv.h"
diff --git a/orte/orted/pmix/pmix_server_dyn.c b/orte/orted/pmix/pmix_server_dyn.c
index b8940bd264d..1f3eae7f1d6 100644
--- a/orte/orted/pmix/pmix_server_dyn.c
+++ b/orte/orted/pmix/pmix_server_dyn.c
@@ -16,7 +16,7 @@
  * Copyright (c) 2013-2016 Intel, Inc.  All rights reserved.
  * Copyright (c) 2014      Mellanox Technologies, Inc.
  *                         All rights reserved.
- * Copyright (c) 2014-2016 Research Organization for Information Science
+ * Copyright (c) 2014-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
@@ -38,7 +38,7 @@
 #include "opal/util/output.h"
 #include "opal/util/path.h"
 #include "opal/dss/dss.h"
-#include "opal/mca/hwloc/hwloc.h"
+#include "opal/mca/hwlocxxx/hwlocxxx.h"
 
 #include "orte/mca/errmgr/errmgr.h"
 #include "orte/mca/rmaps/base/base.h"
diff --git a/orte/orted/pmix/pmix_server_register_fns.c b/orte/orted/pmix/pmix_server_register_fns.c
index 22c1a76856e..7ef9c1d8bd9 100644
--- a/orte/orted/pmix/pmix_server_register_fns.c
+++ b/orte/orted/pmix/pmix_server_register_fns.c
@@ -16,7 +16,7 @@
  * Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
  * Copyright (c) 2014      Mellanox Technologies, Inc.
  *                         All rights reserved.
- * Copyright (c) 2014-2016 Research Organization for Information Science
+ * Copyright (c) 2014-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
@@ -38,7 +38,7 @@
 #include "opal/util/argv.h"
 #include "opal/util/output.h"
 #include "opal/util/error.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/mca/pmix/pmix.h"
 
 #include "orte/util/name_fns.h"
diff --git a/orte/runtime/data_type_support/orte_dt_packing_fns.c b/orte/runtime/data_type_support/orte_dt_packing_fns.c
index 9ab47c0fa89..72a9a718e0a 100644
--- a/orte/runtime/data_type_support/orte_dt_packing_fns.c
+++ b/orte/runtime/data_type_support/orte_dt_packing_fns.c
@@ -13,6 +13,8 @@
  * Copyright (c) 2011-2013 Los Alamos National Security, LLC.
  *                         All rights reserved.
  * Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
+ * Copyright (c) 2017      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -28,7 +30,7 @@
 #include "opal/util/argv.h"
 #include "opal/dss/dss.h"
 #include "opal/dss/dss_internal.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/class/opal_pointer_array.h"
 
 #include "orte/mca/errmgr/errmgr.h"
diff --git a/orte/runtime/data_type_support/orte_dt_print_fns.c b/orte/runtime/data_type_support/orte_dt_print_fns.c
index 5eeed9de5b8..7c07454befe 100644
--- a/orte/runtime/data_type_support/orte_dt_print_fns.c
+++ b/orte/runtime/data_type_support/orte_dt_print_fns.c
@@ -14,6 +14,8 @@
  * Copyright (c) 2011-2013 Los Alamos National Security, LLC.
  *                         All rights reserved.
  * Copyright (c) 2013-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
@@ -27,7 +29,7 @@
 #include <sys/types.h>
 
 #include "opal/util/argv.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 
 #include "orte/mca/errmgr/errmgr.h"
 #include "orte/mca/grpcomm/grpcomm.h"
diff --git a/orte/runtime/data_type_support/orte_dt_unpacking_fns.c b/orte/runtime/data_type_support/orte_dt_unpacking_fns.c
index d46d86c0a54..cfdc2fddb53 100644
--- a/orte/runtime/data_type_support/orte_dt_unpacking_fns.c
+++ b/orte/runtime/data_type_support/orte_dt_unpacking_fns.c
@@ -13,6 +13,8 @@
  * Copyright (c) 2011-2013 Los Alamos National Security, LLC.
  *                         All rights reserved.
  * Copyright (c) 2014-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
@@ -27,7 +29,7 @@
 
 #include "opal/dss/dss.h"
 #include "opal/dss/dss_internal.h"
-#include "opal/mca/hwloc/hwloc.h"
+#include "opal/mca/hwlocxxx/hwlocxxx.h"
 #include "opal/util/argv.h"
 
 #include "orte/mca/errmgr/errmgr.h"
diff --git a/orte/runtime/orte_globals.c b/orte/runtime/orte_globals.c
index 16b6a753763..f2e14f26091 100644
--- a/orte/runtime/orte_globals.c
+++ b/orte/runtime/orte_globals.c
@@ -14,7 +14,7 @@
  * Copyright (c) 2011-2013 Los Alamos National Security, LLC.
  *                         All rights reserved.
  * Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
- * Copyright (c) 2014-2015 Research Organization for Information Science
+ * Copyright (c) 2014-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2017      IBM Corporation.  All rights reserved.
  * $COPYRIGHT$
@@ -32,7 +32,7 @@
 #include <sys/time.h>
 #endif
 
-#include "opal/mca/hwloc/hwloc.h"
+#include "opal/mca/hwlocxxx/hwlocxxx.h"
 #include "opal/mca/pmix/pmix.h"
 #include "opal/util/argv.h"
 #include "opal/util/output.h"
diff --git a/orte/runtime/orte_globals.h b/orte/runtime/orte_globals.h
index d11433d056d..e6f3a1844b2 100644
--- a/orte/runtime/orte_globals.h
+++ b/orte/runtime/orte_globals.h
@@ -15,6 +15,8 @@
  *                         All rights reserved.
  * Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
  * Copyright (c) 2017      IBM Corporation.  All rights reserved.
+ * Copyright (c) 2017      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -44,8 +46,8 @@
 #include "opal/class/opal_ring_buffer.h"
 #include "opal/threads/threads.h"
 #include "opal/mca/event/event.h"
-#include "opal/mca/hwloc/hwloc.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/hwlocxxx.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 
 #include "orte/mca/plm/plm_types.h"
 #include "orte/mca/rml/rml_types.h"
diff --git a/orte/test/mpi/binding.c b/orte/test/mpi/binding.c
index a8a641f1a1c..77a08c479e8 100644
--- a/orte/test/mpi/binding.c
+++ b/orte/test/mpi/binding.c
@@ -10,7 +10,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <sched.h>
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "mpi.h"
 
 #include "orte/util/proc_info.h"
diff --git a/orte/test/mpi/hello.c b/orte/test/mpi/hello.c
index 6f1e430fb73..a03967d208f 100644
--- a/orte/test/mpi/hello.c
+++ b/orte/test/mpi/hello.c
@@ -6,7 +6,7 @@
  */
 
 #include <stdio.h>
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "mpi.h"
 
 #include "orte/util/proc_info.h"
diff --git a/orte/test/system/opal_hwloc.c b/orte/test/system/opal_hwloc.c
index f07cbf2bf3e..f48c51f293a 100644
--- a/orte/test/system/opal_hwloc.c
+++ b/orte/test/system/opal_hwloc.c
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/runtime/opal.h"
 
 
diff --git a/orte/tools/orterun/orterun.c b/orte/tools/orterun/orterun.c
index 1a2b8ff40d1..08825a5c0b9 100644
--- a/orte/tools/orterun/orterun.c
+++ b/orte/tools/orterun/orterun.c
@@ -15,7 +15,7 @@
  * Copyright (c) 2007-2016 Los Alamos National Security, LLC.  All rights
  *                         reserved.
  * Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
- * Copyright (c) 2015      Research Organization for Information Science
+ * Copyright (c) 2015 -2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
@@ -58,7 +58,7 @@
 
 #include "opal/mca/event/event.h"
 #include "opal/mca/installdirs/installdirs.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/mca/base/base.h"
 #include "opal/util/argv.h"
 #include "opal/util/output.h"
diff --git a/orte/util/nidmap.c b/orte/util/nidmap.c
index 753f9bd12ad..2be03d352cf 100644
--- a/orte/util/nidmap.c
+++ b/orte/util/nidmap.c
@@ -13,7 +13,7 @@
  * Copyright (c) 2012-2014 Los Alamos National Security, LLC.
  *                         All rights reserved.
  * Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
- * Copyright (c) 2014      Research Organization for Information Science
+ * Copyright (c) 2014 -2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
@@ -53,7 +53,7 @@
 #include "opal/runtime/opal.h"
 #include "opal/class/opal_pointer_array.h"
 #include "opal/mca/pmix/pmix.h"
-#include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/hwlocxxx/base/base.h"
 #include "opal/util/net.h"
 #include "opal/util/output.h"
 #include "opal/util/argv.h"
diff --git a/orte/util/proc_info.h b/orte/util/proc_info.h
index ace299370da..8555e287a1f 100644
--- a/orte/util/proc_info.h
+++ b/orte/util/proc_info.h
@@ -12,6 +12,8 @@
  * Copyright (c) 2011-2012 Los Alamos National Security, LLC.
  *                         All rights reserved.
  * Copyright (c) 2013-2016 Intel, Inc. All rights reserved
+ * Copyright (c) 2017      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -40,7 +42,7 @@
 #include "orte/types.h"
 
 #include "opal/dss/dss_types.h"
-#include "opal/mca/hwloc/hwloc.h"
+#include "opal/mca/hwlocxxx/hwlocxxx.h"
 #include "opal/util/proc.h"
 
 BEGIN_C_DECLS
diff --git a/oshmem/proc/proc.h b/oshmem/proc/proc.h
index 5e4b3ab3544..bedd1b2ad54 100644
--- a/oshmem/proc/proc.h
+++ b/oshmem/proc/proc.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2013      Mellanox Technologies, Inc.
  *                         All rights reserved.
- * Copyright (c) 2016      Research Organization for Information Science
+ * Copyright (c) 2016 -2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
@@ -21,7 +21,7 @@
 #include "opal/class/opal_list.h"
 #include "opal/util/proc.h"
 #include "opal/dss/dss_types.h"
-#include "opal/mca/hwloc/hwloc.h"
+#include "opal/mca/hwlocxxx/hwlocxxx.h"
 
 #include "orte/types.h"
 #include "orte/runtime/orte_globals.h"