Make epan/iana_snap_pid.h the header file of packet-iana-oui.c

Change-Id: I123c591cb0eb83b561163119a4b00c616bcd0990
Reviewed-on: https://code.wireshark.org/review/7666
Reviewed-by: Michael Mann <mmann78@netscape.net>

epan/Makefile.common

@@ -202,7 +202,6 @@ LIBWIRESHARK_INCLUDES =		\
 	geoip_db.h		\
 	golay.h			\
 	guid-utils.h		\
-	iana_snap_pid.h		\
 	iax2_codec_type.h	\
 	in_cksum.h		\
 	ip_opts.h		\

epan/dissectors/Makefile.common

@@ -1519,6 +1519,7 @@ DISSECTOR_INCLUDES =	\
 	packet-hpext.h	\
 	packet-http.h	\
 	packet-i2c.h	\
+	packet-iana-oui.h \
 	packet-iax2.h	\
 	packet-icmp.h	\
 	packet-idmp.h	\

epan/dissectors/packet-iana-oui.c

@@ -24,8 +24,8 @@
 
 #include <epan/packet.h>
 #include "packet-llc.h"
+#include "packet-iana-oui.h"
 #include <epan/oui.h>
-#include <epan/iana_snap_pid.h>
 
 void proto_register_iana_oui(void);
 

epan/dissectors/packet-iana-oui.h

@@ -1,4 +1,4 @@
-/* iana-snap-pid.h
+/* packet-iana-oui.h
  * SNAP PIDs for the IANA's OUI 00:00:5e
  * See
  *

epan/dissectors/packet-nhrp.c

@@ -38,7 +38,7 @@
 #include <epan/oui.h>
 #include <epan/afn.h>
 #include <epan/in_cksum.h>
-#include <epan/iana_snap_pid.h>
+#include "packet-iana-oui.h"
 #include "packet-llc.h"
 #include "packet-nhrp.h"
 #include "packet-gre.h"