diff --git a/src/mca/ns/base/base.h b/src/mca/ns/base/base.h
index 4b71322e7e..bfbfda95d9 100644
--- a/src/mca/ns/base/base.h
+++ b/src/mca/ns/base/base.h
@@ -19,13 +19,10 @@
 /*
  * Global functions for MCA overall collective open and close
  */
-#if defined(c_plusplus) || defined(__cplusplus)
-extern "C" {
-#endif
-    int mca_ns_base_open(void);
-    int mca_ns_base_select(bool *allow_multi_user_threads,
-			    bool *have_hidden_threads);
-    int mca_ns_base_close(void);
+int mca_ns_base_open(void);
+int mca_ns_base_select(bool *allow_multi_user_threads,
+		       bool *have_hidden_threads);
+int mca_ns_base_close(void);
 
 /*
  * Base functions that are common to all implementations - can be overridden
@@ -52,10 +49,6 @@ int ns_base_compare(ompi_ns_cmp_bitmask_t fields,
                     const ompi_process_name_t* name1,
                     const ompi_process_name_t* name2);
 
-#if defined(c_plusplus) || defined(__cplusplus)
-}
-#endif
-
 
 /*
  * globals that might be needed
diff --git a/src/mca/ns/base/ns_base_open.c b/src/mca/ns/base/ns_base_open.c
index bb4d1d176d..3b078aa664 100644
--- a/src/mca/ns/base/ns_base_open.c
+++ b/src/mca/ns/base/ns_base_open.c
@@ -26,11 +26,6 @@ mca_ns_t ompi_name_server;
 ompi_list_t mca_ns_base_modules_available;
 mca_ns_base_module_t mca_ns_base_selected_module;
 
-OBJ_CLASS_INSTANCE(
-		   ompi_process_name_t,  /* type name */
-		   ompi_object_t,        /* parent "class" */
-		   NULL,                 /* no constructor */
-                   NULL);                /* no destructor */
 
 /**
  * Function for finding and opening either all MCA modules, or the one
diff --git a/src/mca/ns/replica/src/ns_replica_module.c b/src/mca/ns/replica/src/ns_replica_module.c
index e692e0c218..7ee7dbc4d5 100644
--- a/src/mca/ns/replica/src/ns_replica_module.c
+++ b/src/mca/ns/replica/src/ns_replica_module.c
@@ -18,7 +18,7 @@
 #include "ompi_config.h"
 #include "include/constants.h"
 #include "mca/mca.h"
-#include "mca/ns/ns.h"
+#include "mca/ns/base/base.h"
 #include "ns_replica.h"