diff --git a/plugins/docsis/packet-map.c b/plugins/docsis/packet-map.c
index f315cbd762..e5d8765383 100644
--- a/plugins/docsis/packet-map.c
+++ b/plugins/docsis/packet-map.c
@@ -31,9 +31,9 @@
 #define IUC_LONG_DATA_GRANT 6
 #define IUC_NULL_IE 7
 #define IUC_DATA_ACK 8
-#define IUC_RESERVED9 9
-#define IUC_RESERVED10 10
-#define IUC_RESERVED11 11
+#define IUC_ADV_PHY_SHORT_DATA_GRANT 9
+#define IUC_ADV_PHY_LONG_DATA_GRANT 10
+#define IUC_ADV_PHY_UGS 11
 #define IUC_RESERVED12 12
 #define IUC_RESERVED13 13
 #define IUC_RESERVED14 14
@@ -63,8 +63,24 @@ static int hf_docsis_map_offset = -1;
 /* Initialize the subtree pointers */
 static gint ett_docsis_map = -1;
 
-/* Defined in packet-ucd.c */
-extern value_string iuc_vals[];
+static const value_string iuc_vals[] = {
+  {IUC_REQUEST,                  "Request"},
+  {IUC_REQ_DATA,                 "REQ/Data"},
+  {IUC_INIT_MAINT,               "Initial Maintenance"},
+  {IUC_STATION_MAINT,            "Station Maintenance"},
+  {IUC_SHORT_DATA_GRANT,         "Short Data Grant"},
+  {IUC_LONG_DATA_GRANT,          "Long Data Grant"},
+  {IUC_NULL_IE,                  "NULL IE"},
+  {IUC_DATA_ACK,                 "Data Ack"},
+  {IUC_ADV_PHY_SHORT_DATA_GRANT, "Advanced Phy Short Data Grant"},
+  {IUC_ADV_PHY_LONG_DATA_GRANT,  "Advanced Phy Long Data Grant"},
+  {IUC_ADV_PHY_UGS,              "Advanced Phy UGS"},
+  {IUC_RESERVED12,               "Reserved"},
+  {IUC_RESERVED13,               "Reserved"},
+  {IUC_RESERVED14,               "Reserved"},
+  {IUC_EXPANSION,                "Expanded IUC"},
+  {0, NULL}
+};
 
 /* Code to actually dissect the packets */
 static int
diff --git a/plugins/docsis/packet-type29ucd.c b/plugins/docsis/packet-type29ucd.c
index 83d7c4d65f..00e6594171 100644
--- a/plugins/docsis/packet-type29ucd.c
+++ b/plugins/docsis/packet-type29ucd.c
@@ -26,7 +26,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/exceptions.h>
 #include <epan/expert.h>
 
 #define type29ucd_SYMBOL_RATE 1
@@ -225,7 +224,7 @@ static const value_string mod_vals2[] = {
   {0, NULL}
 };
 
-value_string iuc_vals2[] = {
+static const value_string iuc_vals2[] = {
   {IUC_REQUEST,                  "Request"},
   {IUC_REQ_DATA,                 "REQ/Data"},
   {IUC_INIT_MAINT,               "Initial Maintenance"},
diff --git a/plugins/docsis/packet-ucd.c b/plugins/docsis/packet-ucd.c
index 5dd0ebc728..aaccd67afe 100644
--- a/plugins/docsis/packet-ucd.c
+++ b/plugins/docsis/packet-ucd.c
@@ -25,7 +25,6 @@
 #include "config.h"
 
 #include <epan/packet.h>
-#include <epan/exceptions.h>
 #include <epan/expert.h>
 
 #define UCD_SYMBOL_RATE 1
@@ -190,7 +189,7 @@ static const value_string mod_vals[] = {
   {0, NULL}
 };
 
-value_string iuc_vals[] = {
+static const value_string iuc_vals[] = {
   {IUC_REQUEST,                  "Request"},
   {IUC_REQ_DATA,                 "REQ/Data"},
   {IUC_INIT_MAINT,               "Initial Maintenance"},
@@ -207,7 +206,6 @@ value_string iuc_vals[] = {
   {IUC_RESERVED14,               "Reserved"},
   {IUC_EXPANSION,                "Expanded IUC"},
   {0, NULL}
-
 };
 
 static const value_string last_cw_len_vals[] = {