diff --git a/epan/dissectors/packet-lldp.h b/epan/dissectors/packet-lldp.h
index 942541b584..96a7c9c9a7 100644
--- a/epan/dissectors/packet-lldp.h
+++ b/epan/dissectors/packet-lldp.h
@@ -29,22 +29,6 @@
 
 #include "oui.h"
 
-static const value_string tlv_oui_subtype_vals[] = {
-	/* Currently, the manuf file calls this "Ieee8021"; "IEEE 802.1" looks better */
-	{ OUI_IEEE_802_1,	"IEEE 802.1" },
-	/* Currently, the manuf file calls this "Ieee8023"; "IEEE 802.3" looks better */
-	{ OUI_IEEE_802_3,	"IEEE 802.3" },
-	/* Currently, the manuf file calls this "Telecomm"; "TIA TR-41 Committee" looks better */
-	{ OUI_MEDIA_ENDPOINT,	"TIA TR-41 Committee" },
-	/* Currently, the manuf file calls this "Profibus" */
-	{ OUI_PROFINET,         "PROFINET" },
-	/* Currently, the manuf file calls this "Procurve", as it's assigned to HP! */
-	{ OUI_IEEE_802_1QBG,	"IEEE 802.1Qbg" },
-	/*  Data Center Bridging Exchange */
-	{ OUI_DCBX,		"Data Center Bridging Capabilities Exchange" },
-	{ 0, NULL }
-};
-
 /* TLV Types */
 #define END_OF_LLDPDU_TLV_TYPE			0x00	/* Mandatory */
 #define CHASSIS_ID_TLV_TYPE				0x01	/* Mandatory */
diff --git a/epan/oui.h b/epan/oui.h
index 0ffc128066..bae839fe01 100644
--- a/epan/oui.h
+++ b/epan/oui.h
@@ -90,6 +90,23 @@
  */
 extern const value_string oui_vals[];
 
+
+static const value_string tlv_oui_subtype_vals[] = {
+    /* Currently, the manuf file calls this "Ieee8021"; "IEEE 802.1" looks better */
+    { OUI_IEEE_802_1,       "IEEE 802.1" },
+    /* Currently, the manuf file calls this "Ieee8023"; "IEEE 802.3" looks better */
+    { OUI_IEEE_802_3,       "IEEE 802.3" },
+    /* Currently, the manuf file calls this "Telecomm"; "TIA TR-41 Committee" looks better */
+    { OUI_MEDIA_ENDPOINT,   "TIA TR-41 Committee" },
+    /* Currently, the manuf file calls this "Profibus" */
+    { OUI_PROFINET,         "PROFINET" },
+    /* Currently, the manuf file calls this "Procurve", as it's assigned to HP! */
+    { OUI_IEEE_802_1QBG,    "IEEE 802.1Qbg" },
+    /*  Data Center Bridging Exchange */
+    { OUI_DCBX,             "Data Center Bridging Capabilities Exchange" },
+    { 0, NULL }
+};
+
 #endif
 
 /*