From Alexis La Goutte:

Cleanup packet-ipv6.h and dependency.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5713

svn path=/trunk/; revision=36031

epan/dissectors/packet-6lowpan.c

@@ -56,8 +56,8 @@
 #include <epan/reassemble.h>
 #include <epan/ipproto.h>
 #include <epan/in_cksum.h>
-#include "epan/dissectors/packet-ipv6.h"
-#include "epan/dissectors/packet-ieee802154.h"
+#include "packet-ipv6.h"
+#include "packet-ieee802154.h"
 
 /* Definitions for 6lowpan packet disassembly structures and routines */
 

epan/dissectors/packet-bgp.c

@@ -55,7 +55,6 @@
 #include <epan/packet.h>
 #include <epan/addr_and_mask.h>
 #include "packet-bgp.h"
-#include "packet-ipv6.h"
 #include "packet-frame.h"
 #include <epan/afn.h>
 #include <epan/prefs.h>

epan/dissectors/packet-cops.c

@@ -66,7 +66,6 @@
 
 #include <epan/packet.h>
 #include <epan/emem.h>
-#include "packet-ipv6.h"
 #include "packet-tcp.h"
 
 #include <epan/oids.h>

epan/dissectors/packet-gsm_a_dtap.c

@@ -105,7 +105,6 @@
 #include "packet-ber.h"
 #include "packet-q931.h"
 #include "packet-gsm_a_common.h"
-#include "packet-ipv6.h"
 #include "packet-ppp.h"
 #include "packet-gsm_sms.h"
 #include "expert.h"

epan/dissectors/packet-gsm_a_gm.c

@@ -73,7 +73,6 @@
 #include "packet-ber.h"
 #include "packet-q931.h"
 #include "packet-gsm_a_common.h"
-#include "packet-ipv6.h"
 #include "packet-e212.h"
 #include "packet-ppp.h"
 

epan/dissectors/packet-gsm_a_rr.c

@@ -56,13 +56,11 @@
 #include <epan/prefs.h>
 #include <epan/tap.h>
 #include <epan/asn1.h>
-
 #include "packet-bssap.h"
 #include "packet-sccp.h"
 #include "packet-ber.h"
 #include "packet-q931.h"
 #include "packet-gsm_a_common.h"
-#include "packet-ipv6.h"
 #include "packet-e212.h"
 #include "packet-ppp.h"
 

epan/dissectors/packet-gtp.c

@@ -55,7 +55,6 @@
 #include <epan/sminmpec.h>
 #include <epan/asn1.h>
 #include <epan/tap.h>
-#include "packet-ipv6.h"
 #include "packet-ppp.h"
 #include "packet-radius.h"
 #include "packet-bssap.h"

epan/dissectors/packet-ipv6.h

@@ -8,12 +8,6 @@
  *
  * Copyright 1998 Gerald Combs
  *
- * MobileIPv6 support added by Tomislav Borosa <tomislav.borosa@siemens.hr>
- *
- * HMIPv6 support added by Martti Kuparinen <martti.kuparinen@iki.fi>
- *
- * FMIPv6 support added by Martin Andre <andre@clarinet.u-strasbg.fr>
- *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2

epan/dissectors/packet-isis-lsp.c

@@ -32,7 +32,6 @@
 #include <epan/ipv4.h>
 #include <epan/packet.h>
 #include "packet-osi.h"
-#include "packet-ipv6.h"
 #include "packet-isis.h"
 #include "packet-isis-clv.h"
 #include "packet-isis-lsp.h"

epan/dissectors/packet-pflog.c

@@ -37,7 +37,6 @@
 #include <epan/etypes.h>
 #include <epan/addr_resolv.h>
 #include "packet-ip.h"
-#include "packet-ipv6.h"
 #include "packet-pflog.h"
 
 #ifndef offsetof

epan/dissectors/packet-raw.c

@@ -35,7 +35,6 @@
 #include "packet-raw.h"
 #include "packet-ip.h"
 #include "packet-ppp.h"
-#include "packet-ipv6.h"
 
 static int proto_raw = -1;
 static gint ett_raw = -1;

epan/dissectors/packet-sap.c

@@ -34,7 +34,6 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
-#include "packet-ipv6.h"
 
 #define UDP_PORT_SAP	9875