diff --git a/ompi/mca/bml/r2/bml_r2.c b/ompi/mca/bml/r2/bml_r2.c
index f0481cecbf..4b569178a9 100644
--- a/ompi/mca/bml/r2/bml_r2.c
+++ b/ompi/mca/bml/r2/bml_r2.c
@@ -12,7 +12,7 @@
  *                         All rights reserved.
  * Copyright (c) 2007-2012 Los Alamos National Security, LLC.  All rights
  *                         reserved. 
- * Copyright (c) 2008-2009 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2008-2014 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2013      Intel, Inc. All rights reserved
  * $COPYRIGHT$
  * 
@@ -43,15 +43,6 @@ extern mca_bml_base_component_t mca_bml_r2_component;
 /* Names of all the BTL components that this BML is aware of */
 static char *btl_names = NULL;
 
-static inline unsigned int bml_base_log2(unsigned long val) {
-    unsigned int count = 0;
-    while(val > 0) {
-        val = val >> 1;
-        count++;
-    }
-    return count > 0 ? count-1: 0;
-}
-
 static int btl_exclusivity_compare(const void* arg1, const void* arg2)
 {
     mca_btl_base_module_t* btl1 = *(struct mca_btl_base_module_t**)arg1;
diff --git a/ompi/mca/coll/ml/coll_ml_module.c b/ompi/mca/coll/ml/coll_ml_module.c
index babf40ab07..6f1b8b23fb 100644
--- a/ompi/mca/coll/ml/coll_ml_module.c
+++ b/ompi/mca/coll/ml/coll_ml_module.c
@@ -4,7 +4,7 @@
  * Copyright (c) 2009-2012 Mellanox Technologies.  All rights reserved.
  * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
  *                         reserved.
- * Copyright (c) 2013      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2013-2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -52,15 +52,6 @@ static int coll_ml_parse_topology (sub_group_params_t *sub_group_meta_data, size
 
 /* #define NEW_LEADER_SELECTION */
 
-static inline double ret_us(void)
-{
-    struct timeval t;
-
-    gettimeofday(&t, NULL);
-
-    return t.tv_sec * 1e6 + t.tv_usec;
-}
-
 struct ranks_proxy_t {
     /* number of subgroups for which the rank is a proxy */
     int number_subgroups;
diff --git a/ompi/mca/common/verbs/common_verbs_find_ports.c b/ompi/mca/common/verbs/common_verbs_find_ports.c
index bc27cdfd6e..bb9c424118 100644
--- a/ompi/mca/common/verbs/common_verbs_find_ports.c
+++ b/ompi/mca/common/verbs/common_verbs_find_ports.c
@@ -160,22 +160,6 @@ static bool want_this_port(char **include_list, char **exclude_list,
 
 /***********************************************************************/
 
-static const char *transport_name_to_str(enum ibv_transport_type transport_type)
-{
-    switch(transport_type) {
-    case IBV_TRANSPORT_IB:        return "IB";
-    case IBV_TRANSPORT_IWARP:     return "IWARP";
-#if HAVE_DECL_IBV_TRANSPORT_USNIC
-    case IBV_TRANSPORT_USNIC:     return "usNIC";
-#endif
-#if HAVE_DECL_IBV_TRANSPORT_USNIC_UDP
-    case IBV_TRANSPORT_USNIC_UDP: return "usNIC UDP";
-#endif
-    case IBV_TRANSPORT_UNKNOWN: 
-    default:                      return "unknown";
-    }
-}
-
 #if HAVE_DECL_IBV_LINK_LAYER_ETHERNET
 static const char *link_layer_to_str(int link_type)
 {
diff --git a/ompi/mca/op/base/op_base_functions.c b/ompi/mca/op/base/op_base_functions.c
index acd478f245..c38f15fbdb 100644
--- a/ompi/mca/op/base/op_base_functions.c
+++ b/ompi/mca/op/base/op_base_functions.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-2014 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2013      Los Alamos National Security, LLC. All rights
  *                         reserved.
  * $COPYRIGHT$
@@ -157,7 +157,7 @@ FUNC_FUNC(max, fortran_real4, ompi_fortran_real4_t)
 #if OMPI_HAVE_FORTRAN_REAL8
 FUNC_FUNC(max, fortran_real8, ompi_fortran_real8_t)
 #endif
-#if OMPI_HAVE_FORTRAN_REAL16
+#if OMPI_HAVE_FORTRAN_REAL16 && OMPI_REAL16_MATCHES_C
 FUNC_FUNC(max, fortran_real16, ompi_fortran_real16_t)
 #endif
 
@@ -217,7 +217,7 @@ FUNC_FUNC(min, fortran_real4, ompi_fortran_real4_t)
 #if OMPI_HAVE_FORTRAN_REAL8
 FUNC_FUNC(min, fortran_real8, ompi_fortran_real8_t)
 #endif
-#if OMPI_HAVE_FORTRAN_REAL16
+#if OMPI_HAVE_FORTRAN_REAL16 && OMPI_REAL16_MATCHES_C
 FUNC_FUNC(min, fortran_real16, ompi_fortran_real16_t)
 #endif
 
@@ -274,7 +274,7 @@ OP_FUNC(sum, fortran_real4, ompi_fortran_real4_t, +=)
 #if OMPI_HAVE_FORTRAN_REAL8
 OP_FUNC(sum, fortran_real8, ompi_fortran_real8_t, +=)
 #endif
-#if OMPI_HAVE_FORTRAN_REAL16
+#if OMPI_HAVE_FORTRAN_REAL16 && OMPI_REAL16_MATCHES_C
 OP_FUNC(sum, fortran_real16, ompi_fortran_real16_t, +=)
 #endif
 /* Complex */
@@ -341,7 +341,7 @@ OP_FUNC(prod, fortran_real4, ompi_fortran_real4_t, *=)
 #if OMPI_HAVE_FORTRAN_REAL8
 OP_FUNC(prod, fortran_real8, ompi_fortran_real8_t, *=)
 #endif
-#if OMPI_HAVE_FORTRAN_REAL16
+#if OMPI_HAVE_FORTRAN_REAL16 && OMPI_REAL16_MATCHES_C
 OP_FUNC(prod, fortran_real16, ompi_fortran_real16_t, *=)
 #endif
 /* Complex */
@@ -737,7 +737,7 @@ FUNC_FUNC_3BUF(max, fortran_real4, ompi_fortran_real4_t)
 #if OMPI_HAVE_FORTRAN_REAL8
 FUNC_FUNC_3BUF(max, fortran_real8, ompi_fortran_real8_t)
 #endif
-#if OMPI_HAVE_FORTRAN_REAL16
+#if OMPI_HAVE_FORTRAN_REAL16 && OMPI_REAL16_MATCHES_C
 FUNC_FUNC_3BUF(max, fortran_real16, ompi_fortran_real16_t)
 #endif
 
@@ -797,7 +797,7 @@ FUNC_FUNC_3BUF(min, fortran_real4, ompi_fortran_real4_t)
 #if OMPI_HAVE_FORTRAN_REAL8
 FUNC_FUNC_3BUF(min, fortran_real8, ompi_fortran_real8_t)
 #endif
-#if OMPI_HAVE_FORTRAN_REAL16
+#if OMPI_HAVE_FORTRAN_REAL16 && OMPI_REAL16_MATCHES_C
 FUNC_FUNC_3BUF(min, fortran_real16, ompi_fortran_real16_t)
 #endif
 
@@ -854,7 +854,7 @@ OP_FUNC_3BUF(sum, fortran_real4, ompi_fortran_real4_t, +)
 #if OMPI_HAVE_FORTRAN_REAL8
 OP_FUNC_3BUF(sum, fortran_real8, ompi_fortran_real8_t, +)
 #endif
-#if OMPI_HAVE_FORTRAN_REAL16
+#if OMPI_HAVE_FORTRAN_REAL16 && OMPI_REAL16_MATCHES_C
 OP_FUNC_3BUF(sum, fortran_real16, ompi_fortran_real16_t, +)
 #endif
 /* Complex */
@@ -921,7 +921,7 @@ OP_FUNC_3BUF(prod, fortran_real4, ompi_fortran_real4_t, *)
 #if OMPI_HAVE_FORTRAN_REAL8
 OP_FUNC_3BUF(prod, fortran_real8, ompi_fortran_real8_t, *)
 #endif
-#if OMPI_HAVE_FORTRAN_REAL16
+#if OMPI_HAVE_FORTRAN_REAL16 && OMPI_REAL16_MATCHES_C
 OP_FUNC_3BUF(prod, fortran_real16, ompi_fortran_real16_t, *)
 #endif
 /* Complex */
diff --git a/ompi/mpi/c/wtick.c b/ompi/mpi/c/wtick.c
index fef74bef92..2d0b01fcd8 100644
--- a/ompi/mpi/c/wtick.c
+++ b/ompi/mpi/c/wtick.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) 2007      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2007-2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -35,8 +35,6 @@
 #include "ompi/mpi/c/profile/defines.h"
 #endif
 
-static const char FUNC_NAME[] = "MPI_Wtick";
-
 
 double MPI_Wtick(void)
 {
diff --git a/ompi/mpi/c/wtime.c b/ompi/mpi/c/wtime.c
index 3adba437a9..6a39f51e23 100644
--- a/ompi/mpi/c/wtime.c
+++ b/ompi/mpi/c/wtime.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      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2006-2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -35,8 +35,6 @@
 #include "ompi/mpi/c/profile/defines.h"
 #endif
 
-static const char FUNC_NAME[] = "MPI_Wtime";
-
 
 double MPI_Wtime(void)
 {
diff --git a/ompi/mpi/fortran/mpif-h/dist_graph_create_adjacent_f.c b/ompi/mpi/fortran/mpif-h/dist_graph_create_adjacent_f.c
index 30e3620884..9ff2d8df74 100644
--- a/ompi/mpi/fortran/mpif-h/dist_graph_create_adjacent_f.c
+++ b/ompi/mpi/fortran/mpif-h/dist_graph_create_adjacent_f.c
@@ -4,7 +4,7 @@
  *                         reserved.
  * Copyright (c) 2011      INRIA.  All rights reserved.
  * Copyright (c) 2011      Université Bordeaux 1
- * Copyright (c) 2013 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2013-2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -59,7 +59,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_DIST_GRAPH_CREATE_ADJACENT,
 #include "ompi/mpi/fortran/mpif-h/profile/defines.h"
 #endif
 
-static const char FUNC_NAME[] = "MPI_DIST_GRAPH_CREATE_ADJACENT";
 
 void ompi_dist_graph_create_adjacent_f(MPI_Fint *comm_old, MPI_Fint *indegree,
                                        MPI_Fint *sources, MPI_Fint *sourceweights,
diff --git a/ompi/mpi/fortran/mpif-h/type_create_hindexed_f.c b/ompi/mpi/fortran/mpif-h/type_create_hindexed_f.c
index 757848fa89..4649ed674c 100644
--- a/ompi/mpi/fortran/mpif-h/type_create_hindexed_f.c
+++ b/ompi/mpi/fortran/mpif-h/type_create_hindexed_f.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) 2011-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2011-2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -64,8 +64,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CREATE_HINDEXED,
 #include "ompi/mpi/fortran/mpif-h/profile/defines.h"
 #endif
 
-static const char FUNC_NAME[] = "MPI_TYPE_CREATE_HINDEXED";
-
 
 void ompi_type_create_hindexed_f(MPI_Fint *count,
 				MPI_Fint *array_of_blocklengths,
diff --git a/ompi/mpi/tool/category_changed.c b/ompi/mpi/tool/category_changed.c
index 7f9ea74acc..d6a18c8ba8 100644
--- a/ompi/mpi/tool/category_changed.c
+++ b/ompi/mpi/tool/category_changed.c
@@ -2,6 +2,7 @@
 /*
  * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -19,7 +20,6 @@
 #include "ompi/mpi/tool/profile/defines.h"
 #endif
 
-static const char FUNC_NAME[] = "MPI_T_category_changed";
 
 int MPI_T_category_changed(int *stamp)
 {
diff --git a/ompi/mpi/tool/category_get_categories.c b/ompi/mpi/tool/category_get_categories.c
index 464d23f397..5be82880b4 100644
--- a/ompi/mpi/tool/category_get_categories.c
+++ b/ompi/mpi/tool/category_get_categories.c
@@ -2,6 +2,7 @@
 /*
  * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -19,7 +20,6 @@
 #include "ompi/mpi/tool/profile/defines.h"
 #endif
 
-static const char FUNC_NAME[] = "MPI_T_category_get_categories";
 
 int MPI_T_category_get_categories(int cat_index, int len, int indices[])
 {
diff --git a/ompi/mpi/tool/category_get_cvars.c b/ompi/mpi/tool/category_get_cvars.c
index 396c9a86ed..ea9424f5ca 100644
--- a/ompi/mpi/tool/category_get_cvars.c
+++ b/ompi/mpi/tool/category_get_cvars.c
@@ -2,6 +2,7 @@
 /*
  * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -19,7 +20,6 @@
 #include "ompi/mpi/tool/profile/defines.h"
 #endif
 
-static const char FUNC_NAME[] = "MPI_T_category_get_cvars";
 
 int MPI_T_category_get_cvars(int cat_index, int len, int indices[])
 {
diff --git a/ompi/mpi/tool/category_get_info.c b/ompi/mpi/tool/category_get_info.c
index cb88882489..c10a2aa708 100644
--- a/ompi/mpi/tool/category_get_info.c
+++ b/ompi/mpi/tool/category_get_info.c
@@ -2,6 +2,7 @@
 /*
  * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -19,7 +20,6 @@
 #include "ompi/mpi/tool/profile/defines.h"
 #endif
 
-static const char FUNC_NAME[] = "MPI_T_category_get_info";
 
 int MPI_T_category_get_info(int cat_index, char *name, int *name_len,
                             char *desc, int *desc_len, int *num_cvars,
diff --git a/ompi/mpi/tool/category_get_num.c b/ompi/mpi/tool/category_get_num.c
index 41ebba3691..dbab0b2bf6 100644
--- a/ompi/mpi/tool/category_get_num.c
+++ b/ompi/mpi/tool/category_get_num.c
@@ -2,6 +2,7 @@
 /*
  * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -19,7 +20,6 @@
 #include "ompi/mpi/tool/profile/defines.h"
 #endif
 
-static const char FUNC_NAME[] = "MPI_T_category_get_num";
 
 int MPI_T_category_get_num (int *num_cat)
 {
diff --git a/ompi/mpi/tool/category_get_pvars.c b/ompi/mpi/tool/category_get_pvars.c
index ed7cdbf4b6..3936fb9b02 100644
--- a/ompi/mpi/tool/category_get_pvars.c
+++ b/ompi/mpi/tool/category_get_pvars.c
@@ -2,6 +2,7 @@
 /*
  * Copyright (c) 2012-213 Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -19,7 +20,6 @@
 #include "ompi/mpi/tool/profile/defines.h"
 #endif
 
-static const char FUNC_NAME[] = "MPI_T_category_get_pvars";
 
 int MPI_T_category_get_pvars(int cat_index, int len, int indices[])
 {
diff --git a/ompi/mpi/tool/cvar_get_info.c b/ompi/mpi/tool/cvar_get_info.c
index d9f73fc6ac..c3a449d182 100644
--- a/ompi/mpi/tool/cvar_get_info.c
+++ b/ompi/mpi/tool/cvar_get_info.c
@@ -2,6 +2,7 @@
 /*
  * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -19,7 +20,6 @@
 #include "ompi/mpi/tool/profile/defines.h"
 #endif
 
-static const char FUNC_NAME[] = "MPI_T_cvar_get_info";
 
 int MPI_T_cvar_get_info(int cvar_index, char *name, int *name_len, int *verbosity,
 			MPI_Datatype *datatype, MPI_T_enum *enumtype, char *desc,
diff --git a/ompi/mpi/tool/cvar_get_num.c b/ompi/mpi/tool/cvar_get_num.c
index b033f526e6..2e3f0bace0 100644
--- a/ompi/mpi/tool/cvar_get_num.c
+++ b/ompi/mpi/tool/cvar_get_num.c
@@ -2,6 +2,7 @@
 /*
  * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -19,7 +20,6 @@
 #include "ompi/mpi/tool/profile/defines.h"
 #endif
 
-static const char FUNC_NAME[] = "MPI_T_cvar_get_num";
 
 int MPI_T_cvar_get_num (int *num_cvar) {
     if (!mpit_is_initialized ()) {
diff --git a/ompi/mpi/tool/cvar_handle_alloc.c b/ompi/mpi/tool/cvar_handle_alloc.c
index 26a086bcd6..608960710b 100644
--- a/ompi/mpi/tool/cvar_handle_alloc.c
+++ b/ompi/mpi/tool/cvar_handle_alloc.c
@@ -2,6 +2,7 @@
 /*
  * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -19,7 +20,6 @@
 #include "ompi/mpi/tool/profile/defines.h"
 #endif
 
-static const char FUNC_NAME[] = "MPI_T_cvar_handle_alloc";
 
 int MPI_T_cvar_handle_alloc (int cvar_index, void *obj_handle,
                              MPI_T_cvar_handle *handle, int *count)
diff --git a/ompi/mpi/tool/cvar_handle_free.c b/ompi/mpi/tool/cvar_handle_free.c
index 589ac566a5..4d64762c8b 100644
--- a/ompi/mpi/tool/cvar_handle_free.c
+++ b/ompi/mpi/tool/cvar_handle_free.c
@@ -2,6 +2,7 @@
 /*
  * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -19,7 +20,6 @@
 #include "ompi/mpi/tool/profile/defines.h"
 #endif
 
-static const char FUNC_NAME[] = "MPI_T_cvar_handle_free";
 
 int MPI_T_cvar_handle_free (MPI_T_cvar_handle *handle)
 {
diff --git a/ompi/mpi/tool/cvar_read.c b/ompi/mpi/tool/cvar_read.c
index 81e3222f28..2b7e839fd5 100644
--- a/ompi/mpi/tool/cvar_read.c
+++ b/ompi/mpi/tool/cvar_read.c
@@ -2,6 +2,7 @@
 /*
  * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -19,7 +20,6 @@
 #include "ompi/mpi/tool/profile/defines.h"
 #endif
 
-static const char FUNC_NAME[] = "MPI_T_cvar_read";
 
 int MPI_T_cvar_read (MPI_T_cvar_handle handle, void *buf)
 {
diff --git a/ompi/mpi/tool/cvar_write.c b/ompi/mpi/tool/cvar_write.c
index b18288621e..a76e6a39c5 100644
--- a/ompi/mpi/tool/cvar_write.c
+++ b/ompi/mpi/tool/cvar_write.c
@@ -2,6 +2,7 @@
 /*
  * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -19,7 +20,6 @@
 #include "ompi/mpi/tool/profile/defines.h"
 #endif
 
-static const char FUNC_NAME[] = "MPI_T_cvar_write";
 
 int MPI_T_cvar_write (MPI_T_cvar_handle handle, const void *buf)
 {
diff --git a/ompi/mpi/tool/enum_get_info.c b/ompi/mpi/tool/enum_get_info.c
index 316f232fe5..129682c2d3 100644
--- a/ompi/mpi/tool/enum_get_info.c
+++ b/ompi/mpi/tool/enum_get_info.c
@@ -2,6 +2,7 @@
 /*
  * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -19,7 +20,6 @@
 #include "ompi/mpi/tool/profile/defines.h"
 #endif
 
-static const char FUNC_NAME[] = "MPI_T_enum_get_info";
 
 int MPI_T_enum_get_info(MPI_T_enum enumtype, int *num, char *name, int *name_len)
 {
diff --git a/ompi/mpi/tool/enum_get_item.c b/ompi/mpi/tool/enum_get_item.c
index 81b625536c..40c52aaefe 100644
--- a/ompi/mpi/tool/enum_get_item.c
+++ b/ompi/mpi/tool/enum_get_item.c
@@ -2,6 +2,7 @@
 /*
  * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -19,7 +20,6 @@
 #include "ompi/mpi/tool/profile/defines.h"
 #endif
 
-static const char FUNC_NAME[] = "MPI_T_enum_get_item";
 
 int MPI_T_enum_get_item(MPI_T_enum enumtype, int index, int *value, char *name,
                         int *name_len)
diff --git a/ompi/mpi/tool/finalize.c b/ompi/mpi/tool/finalize.c
index ea571012b5..4ab29adbfe 100644
--- a/ompi/mpi/tool/finalize.c
+++ b/ompi/mpi/tool/finalize.c
@@ -2,6 +2,7 @@
 /*
  * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -23,7 +24,6 @@
 #include "ompi/mpi/tool/profile/defines.h"
 #endif
 
-static const char FUNC_NAME[] = "MPI_T_finalize";
 
 int MPI_T_finalize (void)
 {
diff --git a/ompi/mpi/tool/init_thread.c b/ompi/mpi/tool/init_thread.c
index 48a26c3150..478d3e9b16 100644
--- a/ompi/mpi/tool/init_thread.c
+++ b/ompi/mpi/tool/init_thread.c
@@ -2,6 +2,7 @@
 /*
  * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -28,7 +29,6 @@ extern opal_mutex_t mpit_big_lock;
 extern volatile uint32_t mpit_init_count;
 extern volatile int32_t initted;
 
-static const char FUNC_NAME[] = "MPI_T_init_thread";
 
 int MPI_T_init_thread (int required, int *provided)
 {
diff --git a/ompi/mpi/tool/pvar_get_info.c b/ompi/mpi/tool/pvar_get_info.c
index 53ed772852..92aec5bea7 100644
--- a/ompi/mpi/tool/pvar_get_info.c
+++ b/ompi/mpi/tool/pvar_get_info.c
@@ -2,6 +2,7 @@
 /*
  * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -19,7 +20,6 @@
 #include "ompi/mpi/tool/profile/defines.h"
 #endif
 
-static const char FUNC_NAME[] = "MPI_T_pvar_get_info";
 
 int MPI_T_pvar_get_info(int pvar_index, char *name, int *name_len,
                         int *verbosity, int *var_class, MPI_Datatype *datatype,
diff --git a/ompi/mpi/tool/pvar_get_num.c b/ompi/mpi/tool/pvar_get_num.c
index bdaaed0b23..201e8b77cf 100644
--- a/ompi/mpi/tool/pvar_get_num.c
+++ b/ompi/mpi/tool/pvar_get_num.c
@@ -2,6 +2,7 @@
 /*
  * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -19,7 +20,6 @@
 #include "ompi/mpi/tool/profile/defines.h"
 #endif
 
-static const char FUNC_NAME[] = "MPI_T_pvar_get_num";
 
 int MPI_T_pvar_get_num(int *num_pvar)
 {
diff --git a/ompi/mpi/tool/pvar_handle_alloc.c b/ompi/mpi/tool/pvar_handle_alloc.c
index 0a9450affc..504fc6f74f 100644
--- a/ompi/mpi/tool/pvar_handle_alloc.c
+++ b/ompi/mpi/tool/pvar_handle_alloc.c
@@ -2,6 +2,7 @@
 /*
  * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -19,7 +20,6 @@
 #include "ompi/mpi/tool/profile/defines.h"
 #endif
 
-static const char FUNC_NAME[] = "MPI_T_pvar_handle_alloc";
 
 int MPI_T_pvar_handle_alloc(MPI_T_pvar_session session, int pvar_index,
                             void *obj_handle, MPI_T_pvar_handle *handle, int *count)
diff --git a/ompi/mpi/tool/pvar_handle_free.c b/ompi/mpi/tool/pvar_handle_free.c
index 75cfa5ba70..9e50577d5b 100644
--- a/ompi/mpi/tool/pvar_handle_free.c
+++ b/ompi/mpi/tool/pvar_handle_free.c
@@ -2,6 +2,7 @@
 /*
  * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -19,7 +20,6 @@
 #include "ompi/mpi/tool/profile/defines.h"
 #endif
 
-static const char FUNC_NAME[] = "MPI_T_pvar_handle_free";
 
 int MPI_T_pvar_handle_free(MPI_T_pvar_session session, MPI_T_pvar_handle *handle)
 {
diff --git a/ompi/mpi/tool/pvar_read.c b/ompi/mpi/tool/pvar_read.c
index 67e13c234f..6710a3018e 100644
--- a/ompi/mpi/tool/pvar_read.c
+++ b/ompi/mpi/tool/pvar_read.c
@@ -2,6 +2,7 @@
 /*
  * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -19,7 +20,6 @@
 #include "ompi/mpi/tool/profile/defines.h"
 #endif
 
-static const char FUNC_NAME[] = "MPI_T_pvar_read";
 
 int MPI_T_pvar_read(MPI_T_pvar_session session, MPI_T_pvar_handle handle,
                     void* buf)
diff --git a/ompi/mpi/tool/pvar_readreset.c b/ompi/mpi/tool/pvar_readreset.c
index 3832bd4ce9..59581bceba 100644
--- a/ompi/mpi/tool/pvar_readreset.c
+++ b/ompi/mpi/tool/pvar_readreset.c
@@ -2,6 +2,7 @@
 /*
  * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -19,7 +20,6 @@
 #include "ompi/mpi/tool/profile/defines.h"
 #endif
 
-static const char FUNC_NAME[] = "MPI_T_pvar_readreset";
 
 int MPI_T_pvar_readreset(MPI_T_pvar_session session, MPI_T_pvar_handle handle,
                          void *buf)
diff --git a/ompi/mpi/tool/pvar_reset.c b/ompi/mpi/tool/pvar_reset.c
index 22b259e45d..1091db0dcc 100644
--- a/ompi/mpi/tool/pvar_reset.c
+++ b/ompi/mpi/tool/pvar_reset.c
@@ -2,6 +2,7 @@
 /*
  * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -19,7 +20,6 @@
 #include "ompi/mpi/tool/profile/defines.h"
 #endif
 
-static const char FUNC_NAME[] = "MPI_T_pvar_reset";
 
 int MPI_T_pvar_reset(MPI_T_pvar_session session, MPI_T_pvar_handle handle)
 {
diff --git a/ompi/mpi/tool/pvar_session_create.c b/ompi/mpi/tool/pvar_session_create.c
index 9ae24b3117..204a27d3fc 100644
--- a/ompi/mpi/tool/pvar_session_create.c
+++ b/ompi/mpi/tool/pvar_session_create.c
@@ -2,6 +2,7 @@
 /*
  * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -19,7 +20,6 @@
 #include "ompi/mpi/tool/profile/defines.h"
 #endif
 
-static const char FUNC_NAME[] = "MPI_T_pvar_session_create";
 
 int MPI_T_pvar_session_create(MPI_T_pvar_session *session)
 {
diff --git a/ompi/mpi/tool/pvar_session_free.c b/ompi/mpi/tool/pvar_session_free.c
index 2c7aa19b0f..41aa3bef6b 100644
--- a/ompi/mpi/tool/pvar_session_free.c
+++ b/ompi/mpi/tool/pvar_session_free.c
@@ -2,6 +2,7 @@
 /*
  * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -19,7 +20,6 @@
 #include "ompi/mpi/tool/profile/defines.h"
 #endif
 
-static const char FUNC_NAME[] = "MPI_T_pvar_session_free";
 
 int MPI_T_pvar_session_free(MPI_T_pvar_session *session)
 {
diff --git a/ompi/mpi/tool/pvar_start.c b/ompi/mpi/tool/pvar_start.c
index 901bde6f37..0f8e71f814 100644
--- a/ompi/mpi/tool/pvar_start.c
+++ b/ompi/mpi/tool/pvar_start.c
@@ -2,6 +2,7 @@
 /*
  * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -19,7 +20,6 @@
 #include "ompi/mpi/tool/profile/defines.h"
 #endif
 
-static const char FUNC_NAME[] = "MPI_T_pvar_start";
 
 static int pvar_handle_start (mca_base_pvar_handle_t *handle)
 {
diff --git a/ompi/mpi/tool/pvar_stop.c b/ompi/mpi/tool/pvar_stop.c
index 52cbaa6de8..9caf60f046 100644
--- a/ompi/mpi/tool/pvar_stop.c
+++ b/ompi/mpi/tool/pvar_stop.c
@@ -2,6 +2,7 @@
 /*
  * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -19,7 +20,6 @@
 #include "ompi/mpi/tool/profile/defines.h"
 #endif
 
-static const char FUNC_NAME[] = "MPI_T_pvar_stop";
 
 static int pvar_handle_stop (mca_base_pvar_handle_t *handle)
 {
diff --git a/ompi/mpi/tool/pvar_write.c b/ompi/mpi/tool/pvar_write.c
index 9940a69534..3f5368d552 100644
--- a/ompi/mpi/tool/pvar_write.c
+++ b/ompi/mpi/tool/pvar_write.c
@@ -2,6 +2,7 @@
 /*
  * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -19,7 +20,6 @@
 #include "ompi/mpi/tool/profile/defines.h"
 #endif
 
-static const char FUNC_NAME[] = "MPI_T_pvar_write";
 
 int MPI_T_pvar_write(MPI_T_pvar_session session, MPI_T_pvar_handle handle,
                      const void* buf)
diff --git a/opal/datatype/opal_datatype_add.c b/opal/datatype/opal_datatype_add.c
index f820afe58d..60832c9bcd 100644
--- a/opal/datatype/opal_datatype_add.c
+++ b/opal/datatype/opal_datatype_add.c
@@ -11,6 +11,7 @@
  * Copyright (c) 2004-2006 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2009      Oak Ridge National Labs.  All rights reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -36,12 +37,10 @@
 #define LMAX(A,B)  ({ OPAL_PTRDIFF_TYPE _a = (A), _b = (B); (_a < _b ? _b : _a) })
 #define LMIN(A,B)  ({ OPAL_PTRDIFF_TYPE _a = (A), _b = (B); (_a < _b ? _a : _b); })
 #define IMAX(A,B)  ({ int _a = (A), _b = (B); (_a < _b ? _b : _a); })
-#define IMIN(A,B)  ({ int _a = (A), _b = (B); (_a < _b ? _a : _b); })
 #else
 static inline OPAL_PTRDIFF_TYPE LMAX( OPAL_PTRDIFF_TYPE a, OPAL_PTRDIFF_TYPE b ) { return ( a < b ? b : a ); }
 static inline OPAL_PTRDIFF_TYPE LMIN( OPAL_PTRDIFF_TYPE a, OPAL_PTRDIFF_TYPE b ) { return ( a < b ? a : b ); }
 static inline int  IMAX( int a, int b ) { return ( a < b ? b : a ); }
-static inline int  IMIN( int a, int b ) { return ( a < b ? a : b ); }
 #endif  /* __GNU__ */
 
 #define OPAL_DATATYPE_COMPUTE_REQUIRED_ENTRIES( _pdtAdd, _count, _extent, _place_needed) \
diff --git a/opal/datatype/opal_datatype_optimize.c b/opal/datatype/opal_datatype_optimize.c
index fe4c822f26..26ac43b156 100644
--- a/opal/datatype/opal_datatype_optimize.c
+++ b/opal/datatype/opal_datatype_optimize.c
@@ -11,6 +11,7 @@
  * Copyright (c) 2004-2006 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2009      Oak Ridge National Labs.  All rights reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -40,32 +41,6 @@
         _elem->extent       = 0;                  \
     } while (0)
 
-static inline int SAVE_OPTIMIZED_ELEMENT( dt_elem_desc_t* pElemDesc,
-                                          ddt_elem_desc_t* opt_elem )
-{
-    if( 0 != opt_elem->count ) {
-        pElemDesc->elem = *opt_elem;
-        SET_EMPTY_ELEMENT( opt_elem );
-    }
-    return 0;
-}
-
-static inline int ADD_ELEMENT( dt_elem_desc_t* pElemDesc __opal_attribute_unused__,
-                               ddt_elem_desc_t* opt_elem,
-                               uint16_t type, uint32_t count,
-                               OPAL_PTRDIFF_TYPE disp, int32_t extent )
-{
-    if( 0 == opt_elem->count ) {
-        opt_elem->common.flags = OPAL_DATATYPE_FLAG_BASIC;
-        opt_elem->common.type  = type;
-        opt_elem->count        = count;
-        opt_elem->disp         = disp;
-        opt_elem->extent       = extent;
-        return 0;
-    }
-    return 1;
-}
-
 static int32_t
 opal_datatype_optimize_short( opal_datatype_t* pData,
                          int32_t count,