diff --git a/src/common/slurm_xlator.h b/src/common/slurm_xlator.h
index e676cd772c846ed40e9dfd43d9f9172a90e79fde..b096e3bedd41749a422bdc5a0e5aed88a0f2fc9e 100644
--- a/src/common/slurm_xlator.h
+++ b/src/common/slurm_xlator.h
@@ -208,28 +208,9 @@
 /* strlcpy.[ch] functions */
 #define	strlcpy			slurm_strlcpy
 
-/* switch.[ch] functions */
-#define	switch_init		slurm_switch_init
-#define	switch_save		slurm_switch_save
-#define	switch_restore		slurm_switch_restore
-#define	switch_no_frag		slurm_switch_no_frag
-#define	switch_get_errno	slurm_switch_get_errno
-#define	switch_strerror		slurm_switch_strerror
-#define	switch_alloc_jobinfo	slurm_switch_alloc_jobinfo
-#define	switch_build_jobinfo	slurm_switch_build_jobinfo
-#define	switch_copy_jobinfo	slurm_switch_copy_jobinfo
-#define	switch_free_jobinfo	slurm_switch_free_jobinfo
-#define	switch_pack_jobinfo	slurm_switch_pack_jobinfo
-#define	switch_unpack_jobinfo	slurm_switch_unpack_jobinfo
-#define	switch_print_jobinfo	slurm_switch_print_jobinfo
-#define	switch_sprint_jobinfo	slurm_switch_sprint_jobinfo
-#define	interconnect_node_init	slurm_interconnect_node_init
-#define	interconnect_node_fini	slurm_interconnect_node_fini
-#define	interconnect_preinit	slurm_interconnect_preinit
-#define	interconnect_init	slurm_interconnect_init
-#define	interconnect_fini	slurm_interconnect_fini
-#define	interconnect_postfini	slurm_interconnect_postfini
-#define	interconnect_attach	slurm_interconnect_attach
+/* switch.[ch] functions
+ * None exported today. 
+ * The header file used only for #define values. */
 
 /* xassert.[ch] functions */
 #define	__xassert_failed	slurm_xassert_failed
diff --git a/src/common/switch.c b/src/common/switch.c
index 9e54e178ce5d47a2958f466155ae1a51dfdc6e8d..9e4e343a4814408ad9e2ae2bb1e797c88979feec 100644
--- a/src/common/switch.c
+++ b/src/common/switch.c
@@ -37,32 +37,6 @@
 #include "src/common/xmalloc.h"
 #include "src/common/xstring.h"
 
-/*
- * Define slurm-specific aliases for use by plugins, see slurm_xlator.h 
- * for details. 
- */
-strong_alias(switch_init,		slurm_switch_init);
-strong_alias(switch_save,		slurm_switch_save);
-strong_alias(switch_restore,		slurm_switch_restore);
-strong_alias(switch_no_frag,		slurm_switch_no_frag);
-strong_alias(switch_get_errno,		slurm_switch_get_errno);
-strong_alias(switch_strerror,		slurm_switch_strerror);
-strong_alias(switch_alloc_jobinfo,	slurm_switch_alloc_jobinfo);
-strong_alias(switch_build_jobinfo,	slurm_switch_build_jobinfo);
-strong_alias(switch_copy_jobinfo,	slurm_switch_copy_jobinfo);
-strong_alias(switch_free_jobinfo,	slurm_switch_free_jobinfo);
-strong_alias(switch_pack_jobinfo,	slurm_switch_pack_jobinfo);
-strong_alias(switch_unpack_jobinfo,	slurm_switch_unpack_jobinfo);
-strong_alias(switch_print_jobinfo,	slurm_switch_print_jobinfo);
-strong_alias(switch_sprint_jobinfo,	slurm_switch_sprint_jobinfo);
-strong_alias(interconnect_node_init,	slurm_interconnect_node_init);
-strong_alias(interconnect_node_fini,	slurm_interconnect_node_fini);
-strong_alias(interconnect_preinit,	slurm_interconnect_preinit);
-strong_alias(interconnect_init,		slurm_interconnect_init);
-strong_alias(interconnect_fini,		slurm_interconnect_fini);
-strong_alias(interconnect_postfini,	slurm_interconnect_postfini);
-strong_alias(interconnect_attach,	slurm_interconnect_attach);
-
 /*
  * WARNING:  Do not change the order of these fields or add additional
  * fields at the beginning of the structure.  If you do, job completion