diff --git a/ompi/mca/btl/openib/btl_openib.c b/ompi/mca/btl/openib/btl_openib.c
index a103e02315..56eb4bf2e9 100644
--- a/ompi/mca/btl/openib/btl_openib.c
+++ b/ompi/mca/btl/openib/btl_openib.c
@@ -10,7 +10,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2007-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2007-2013 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2006-2009 Mellanox Technologies. All rights reserved.
  * Copyright (c) 2006-2012 Los Alamos National Security, LLC.  All rights
  *                         reserved.
@@ -33,6 +33,7 @@
 #include "opal/util/output.h"
 #include "opal/util/arch.h"
 #include "opal/include/opal_stdint.h"
+#include "opal/util/show_help.h"
 
 #include "ompi/mca/rte/rte.h"
 #include "ompi/mca/btl/btl.h"
diff --git a/ompi/mca/btl/openib/btl_openib_async.c b/ompi/mca/btl/openib/btl_openib_async.c
index dc290642b5..f09fe2f136 100644
--- a/ompi/mca/btl/openib/btl_openib_async.c
+++ b/ompi/mca/btl/openib/btl_openib_async.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2008-2009 Mellanox Technologies. All rights reserved.
- * Copyright (c) 2007-2009 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2007-2013 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2006-2007 Voltaire All rights reserved.
  * Copyright (c) 2009-2010 Oracle and/or its affiliates.  All rights reserved
  * $COPYRIGHT$
@@ -20,6 +20,7 @@
 #include <unistd.h>
 #include <errno.h>
 
+#include "opal/util/show_help.h"
 #include "ompi/mca/btl/base/base.h"
 #include "btl_openib.h"
 #include "btl_openib_mca.h"
diff --git a/ompi/mca/btl/openib/btl_openib_component.c b/ompi/mca/btl/openib/btl_openib_component.c
index fbbbe1b81c..13533eaeea 100644
--- a/ompi/mca/btl/openib/btl_openib_component.c
+++ b/ompi/mca/btl/openib/btl_openib_component.c
@@ -10,7 +10,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2006-2013 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2006-2009 Mellanox Technologies. All rights reserved.
  * Copyright (c) 2006-2012 Los Alamos National Security, LLC.  All rights
  *                         reserved.
@@ -60,6 +60,7 @@
 #include "opal/mca/hwloc/base/base.h"
 #include "opal/mca/installdirs/installdirs.h"
 #include "opal_stdint.h"
+#include "opal/util/show_help.h"
 
 #include "ompi/constants.h"
 #include "ompi/proc/proc.h"
diff --git a/ompi/mca/btl/openib/btl_openib_endpoint.c b/ompi/mca/btl/openib/btl_openib_endpoint.c
index 834d79e25a..9922b7870e 100644
--- a/ompi/mca/btl/openib/btl_openib_endpoint.c
+++ b/ompi/mca/btl/openib/btl_openib_endpoint.c
@@ -10,7 +10,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2006-2009 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2006-2013 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2006-2012 Los Alamos National Security, LLC.  All rights
  *                         reserved.
  * Copyright (c) 2006-2007 Voltaire All rights reserved.
@@ -36,6 +36,7 @@
 
 #include "opal_stdint.h"
 #include "opal/util/output.h"
+#include "opal/util/show_help.h"
 
 #include "ompi/types.h"
 #include "ompi/class/ompi_free_list.h"
diff --git a/ompi/mca/btl/openib/btl_openib_ini.c b/ompi/mca/btl/openib/btl_openib_ini.c
index f672799ea4..f38f18a6cc 100644
--- a/ompi/mca/btl/openib/btl_openib_ini.c
+++ b/ompi/mca/btl/openib/btl_openib_ini.c
@@ -9,7 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2006-2009 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2006-2013 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2008      Mellanox Technologies. All rights reserved.
  * Copyright (c) 2012      Los Alamos National Security, LLC.  All rights
  *                         reserved. 
@@ -31,6 +31,7 @@
 #endif
 
 #include "opal/mca/base/mca_base_param.h"
+#include "opal/util/show_help.h"
 
 #include "btl_openib.h"
 #include "btl_openib_lex.h"
diff --git a/ompi/mca/btl/openib/btl_openib_ip.c b/ompi/mca/btl/openib/btl_openib_ip.c
index 9d9596993b..b009c10de7 100644
--- a/ompi/mca/btl/openib/btl_openib_ip.c
+++ b/ompi/mca/btl/openib/btl_openib_ip.c
@@ -21,6 +21,7 @@
 
 #include "opal/util/argv.h"
 #include "opal/util/if.h"
+#include "opal/util/show_help.h"
 
 #include "connect/connect.h"
 #endif
diff --git a/ompi/mca/btl/openib/btl_openib_mca.c b/ompi/mca/btl/openib/btl_openib_mca.c
index d40c183902..2e06c2071c 100644
--- a/ompi/mca/btl/openib/btl_openib_mca.c
+++ b/ompi/mca/btl/openib/btl_openib_mca.c
@@ -9,7 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2006-2013 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2006-2009 Mellanox Technologies. All rights reserved.
  * Copyright (c) 2006-2007 Los Alamos National Security, LLC.  All rights
  *                         reserved.
@@ -30,6 +30,7 @@
 #include "opal/mca/installdirs/installdirs.h"
 #include "opal/util/output.h"
 #include "opal/mca/base/mca_base_param.h"
+#include "opal/util/show_help.h"
 #include "btl_openib.h"
 #include "btl_openib_mca.h"
 #include "btl_openib_ini.h"
diff --git a/ompi/mca/btl/openib/connect/btl_openib_connect_base.c b/ompi/mca/btl/openib/connect/btl_openib_connect_base.c
index 176df86680..99b92220c1 100644
--- a/ompi/mca/btl/openib/connect/btl_openib_connect_base.c
+++ b/ompi/mca/btl/openib/connect/btl_openib_connect_base.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007-2009 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2007-2013 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2007 Mellanox Technologies, Inc.  All rights reserved.
  * Copyright (c) 2012      Los Alamos National Security, LLC.  All rights
  *                         reserved. 
@@ -29,6 +29,7 @@
 
 #include "opal/util/argv.h"
 #include "opal/util/output.h"
+#include "opal/util/show_help.h"
 
 /*
  * Array of all possible connection functions
diff --git a/ompi/mca/btl/openib/connect/btl_openib_connect_oob.c b/ompi/mca/btl/openib/connect/btl_openib_connect_oob.c
index 95d6fec590..08f3a63a22 100644
--- a/ompi/mca/btl/openib/connect/btl_openib_connect_oob.c
+++ b/ompi/mca/btl/openib/connect/btl_openib_connect_oob.c
@@ -9,7 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2006-2013 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2006-2012 Los Alamos National Security, LLC.  All rights
  *                         reserved.
  * Copyright (c) 2008-2011 Mellanox Technologies.  All rights reserved.
@@ -29,6 +29,7 @@
 #include "opal_stdint.h"
 #include "opal/util/error.h"
 #include "opal/util/output.h"
+#include "opal/util/show_help.h"
 
 #include "ompi/mca/rte/rte.h"
 #include "btl_openib.h"
diff --git a/ompi/mca/btl/openib/connect/btl_openib_connect_rdmacm.c b/ompi/mca/btl/openib/connect/btl_openib_connect_rdmacm.c
index d371300640..5b6f683450 100644
--- a/ompi/mca/btl/openib/connect/btl_openib_connect_rdmacm.c
+++ b/ompi/mca/btl/openib/connect/btl_openib_connect_rdmacm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007-2009 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2007-2013 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2007-2008 Chelsio, Inc. All rights reserved.
  * Copyright (c) 2008      Mellanox Technologies. All rights reserved.
  * Copyright (c) 2009      Sandia National Laboratories. All rights reserved.
@@ -48,6 +48,7 @@
 
 #include "opal/util/output.h"
 #include "opal/util/error.h"
+#include "opal/util/show_help.h"
 
 #include "btl_openib_fd.h"
 #include "btl_openib_proc.h"
diff --git a/ompi/mca/btl/openib/connect/btl_openib_connect_sl.c b/ompi/mca/btl/openib/connect/btl_openib_connect_sl.c
index a354f963b3..78bbf6edfb 100644
--- a/ompi/mca/btl/openib/connect/btl_openib_connect_sl.c
+++ b/ompi/mca/btl/openib/connect/btl_openib_connect_sl.c
@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2011      Mellanox Technologies.  All rights reserved.
  *
+ * Copyright (c) 2013 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -10,6 +11,7 @@
 
 #include "btl_openib.h"
 
+#include "opal/util/show_help.h"
 #include "connect/btl_openib_connect_sl.h"
 #include <infiniband/iba/ib_types.h>
 
diff --git a/ompi/mca/btl/openib/connect/btl_openib_connect_xoob.c b/ompi/mca/btl/openib/connect/btl_openib_connect_xoob.c
index 837d84efb0..5cfaf9c00a 100644
--- a/ompi/mca/btl/openib/connect/btl_openib_connect_xoob.c
+++ b/ompi/mca/btl/openib/connect/btl_openib_connect_xoob.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2007-2011 Mellanox Technologies.  All rights reserved.
- * Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2009      IBM Corporation.  All rights reserved.
  * Copyright (c) 2010-2011 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
@@ -21,6 +21,7 @@
 #include "opal/dss/dss.h"
 #include "opal/util/error.h"
 #include "opal/util/output.h"
+#include "opal/util/show_help.h"
 
 #include "ompi/mca/rte/rte.h"
 
diff --git a/ompi/mca/common/ofacm/common_ofacm_base.c b/ompi/mca/common/ofacm/common_ofacm_base.c
index c654195e8c..126a3b558a 100644
--- a/ompi/mca/common/ofacm/common_ofacm_base.c
+++ b/ompi/mca/common/ofacm/common_ofacm_base.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007-2009 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2007-2013 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2007-2012 Mellanox Technologies.  All rights reserved.
  *
  * Copyright (c) 2009-2012 Oak Ridge National Laboratory.  All rights reserved.
@@ -23,6 +23,7 @@
 #include "opal/class/opal_list.h"
 #include "opal/util/argv.h"
 #include "opal/util/output.h"
+#include "opal/util/show_help.h"
 #include "infiniband/verbs.h"
 
 /* Global variables */
diff --git a/ompi/mca/common/ofacm/common_ofacm_oob.c b/ompi/mca/common/ofacm/common_ofacm_oob.c
index c4fff2d05d..b3d36b57b1 100644
--- a/ompi/mca/common/ofacm/common_ofacm_oob.c
+++ b/ompi/mca/common/ofacm/common_ofacm_oob.c
@@ -9,7 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2006-2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2006-2013 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2006-2012 Los Alamos National Security, LLC.  All rights
  *                         reserved.
  * Copyright (c) 2008-2012 Mellanox Technologies.  All rights reserved.
@@ -28,6 +28,7 @@
 #include "opal/dss/dss.h"
 #include "opal/util/error.h"
 #include "opal/util/output.h"
+#include "opal/util/show_help.h"
 
 #include "ompi/mca/rte/rte.h"
 #include "connect.h"
diff --git a/ompi/mca/common/verbs/common_verbs_find_max_inline.c b/ompi/mca/common/verbs/common_verbs_find_max_inline.c
index 1a637f724b..c5d356cbf3 100644
--- a/ompi/mca/common/verbs/common_verbs_find_max_inline.c
+++ b/ompi/mca/common/verbs/common_verbs_find_max_inline.c
@@ -9,7 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2006-2013 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2006-2012 Mellanox Technologies.  All rights reserved.
  * Copyright (c) 2006-2007 Los Alamos National Security, LLC.  All rights
  *                         reserved.
@@ -35,6 +35,7 @@
 #include "opal/util/output.h"
 #include "opal/util/argv.h"
 #include "opal/class/opal_object.h"
+#include "opal/util/show_help.h"
 
 #include "ompi/mca/rte/rte.h"
 #include "ompi/constants.h"
diff --git a/ompi/mca/common/verbs/common_verbs_find_ports.c b/ompi/mca/common/verbs/common_verbs_find_ports.c
index 87627a30c2..2097893cef 100644
--- a/ompi/mca/common/verbs/common_verbs_find_ports.c
+++ b/ompi/mca/common/verbs/common_verbs_find_ports.c
@@ -9,7 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2006-2013 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2006-2012 Mellanox Technologies.  All rights reserved.
  * Copyright (c) 2006-2007 Los Alamos National Security, LLC.  All rights
  *                         reserved.
@@ -35,6 +35,7 @@
 #include "opal/util/output.h"
 #include "opal/util/argv.h"
 #include "opal/class/opal_object.h"
+#include "opal/util/show_help.h"
 
 #include "ompi/constants.h"
 #include "ompi/mca/rte/rte.h"