diff --git a/ipmitool/lib/ipmi_bmc.c b/ipmitool/lib/ipmi_bmc.c
index 2a8d9ae..b24dce0 100644
--- a/ipmitool/lib/ipmi_bmc.c
+++ b/ipmitool/lib/ipmi_bmc.c
@@ -42,37 +42,10 @@
 #include <ipmitool/ipmi.h>
 #include <ipmitool/ipmi_intf.h>
 #include <ipmitool/ipmi_bmc.h>
+#include <ipmitool/ipmi_strings.h>
 
 extern int verbose;
 
-const struct valstr completion_code_vals[] = {
-	{ 0x00, "Command completed normally" },
-	{ 0xc0, "Node busy" },
-	{ 0xc1, "Invalid command" },
-	{ 0xc2, "Invalid command on LUN" },
-	{ 0xc3, "Timeout" },
-	{ 0xc4, "Out of space" },
-	{ 0xc5, "Reservation cancelled or invalid" },
-	{ 0xc6, "Request data truncated" },
-	{ 0xc7, "Request data length invalid" },
-	{ 0xc8, "Request data field length limit exceeded" },
-	{ 0xc9, "Parameter out of range" },
-	{ 0xca, "Cannot return number of requested data bytes" },
-	{ 0xcb, "Requested sensor, data, or record not found" },
-	{ 0xcc, "Invalid data field in request" },
-	{ 0xcd, "Command illegal for specified sensor or record type" },
-	{ 0xce, "Command response could not be provided" },
-	{ 0xcf, "Cannot execute duplicated request" },
-	{ 0xd0, "SDR Repository in update mode" },
-	{ 0xd1, "Device firmeware in update mode" },
-	{ 0xd2, "BMC initialization in progress" },
-	{ 0xd3, "Destination unavailable" },
-	{ 0xd4, "Insufficient privilege level" },
-	{ 0xd5, "Command not supported in present state" },
-	{ 0xff, "Unspecified error" },
-	{ 0x00, NULL }
-};
-
 static int ipmi_bmc_reset(struct ipmi_intf * intf, int cmd)
 {
 	struct ipmi_rs * rsp;
diff --git a/ipmitool/lib/ipmi_channel.c b/ipmitool/lib/ipmi_channel.c
index e8032c6..bf3974a 100644
--- a/ipmitool/lib/ipmi_channel.c
+++ b/ipmitool/lib/ipmi_channel.c
@@ -50,50 +50,11 @@
 #include <ipmitool/helper.h>
 #include <ipmitool/ipmi_lanp.h>
 #include <ipmitool/ipmi_channel.h>
+#include <ipmitool/ipmi_strings.h>
 #include <ipmitool/ipmi_constants.h>
 
 void printf_channel_usage (void);
 
-extern const struct valstr ipmi_authtype_vals[];
-
-static const struct valstr ipmi_channel_protocol_vals[] = {
-			{ 0x00, "reserved" },
-			{ 0x01, "IPMB-1.0" },
-			{ 0x02, "ICMB-1.0" },
-			{ 0x03, "reserved" },
-			{ 0x04, "IPMI-SMBus" },
-			{ 0x05, "KCS" },
-			{ 0x06, "SMIC" },
-			{ 0x07, "BT-10" },
-			{ 0x08, "BT-15" },
-			{ 0x09, "TMode" },
-			{ 0x1c, "OEM 1" },
-			{ 0x1d, "OEM 2" },
-			{ 0x1e, "OEM 3" },
-			{ 0x1f, "OEM 4" },
-			{ 0x00, NULL },
-		};
-
-
-static const struct valstr ipmi_channel_medium_vals[] = {
-			{ 0x00, "reserved" },
-			{ 0x01, "IPMB (I2C)" },
-			{ 0x02, "ICMB v1.0" },
-			{ 0x03, "ICMB v0.9" },
-			{ 0x04, "802.3 LAN" },
-			{ 0x05, "Serial/Modem" },
-			{ 0x06, "Other LAN" },
-			{ 0x07, "PCI SMBus" },
-			{ 0x08, "SMBus v1.0/v1.1" },
-			{ 0x09, "SMBus v2.0" },
-			{ 0x0a, "USB 1.x" },
-			{ 0x0b, "USB 2.x" },
-			{ 0x0c, "System Interface" },
-			{ 0x00, NULL },
-		};
-
-
-
 /**
  * ipmi_1_5_authtypes
  *