diff options
| author | Bill Meier <wmeier@newsguy.com> | 2014-12-20 16:23:59 -0500 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2014-12-21 05:46:22 +0000 |
| commit | b5d7b7ab6e6b0e595d3250d7fa6553d0da79c000 (patch) | |
| tree | 9c89dc59ef32e5b7e1cee654fdf3a30706d7aa11 /epan/dissectors | |
| parent | 14cff7b6e2865efe7229f9831939fd4d241ca10c (diff) | |
| download | wireshark-b5d7b7ab6e6b0e595d3250d7fa6553d0da79c000.tar.gz wireshark-b5d7b7ab6e6b0e595d3250d7fa6553d0da79c000.tar.bz2 wireshark-b5d7b7ab6e6b0e595d3250d7fa6553d0da79c000.zip | |
Cleanup use of #includes in non-generated epan/dissector/*.c
Specifically:
- Set packet.h to be the first wireshark #include after
config.h and "system" #includes.
packet.h added as an #include in some cases when missing.
- Remove some #includes included (directly/indirectly) in
packet.h. E.g., glib.h.
(Done only for those files including packet.h).
- As needed, move "system" #includes to be after config.h and
before wireshark #includes.
- Rework various #include file specifications for consistency.
- Misc.
Change-Id: Ifaa1a14b50b69fbad38ea4838a49dfe595c54c95
Reviewed-on: https://code.wireshark.org/review/5923
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors')
978 files changed, 359 insertions, 2212 deletions
diff --git a/epan/dissectors/file-elf.c b/epan/dissectors/file-elf.c index f1769d7e6a..fa142a2cfe 100644 --- a/epan/dissectors/file-elf.c +++ b/epan/dissectors/file-elf.c @@ -34,8 +34,6 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> - #include "dwarf.h" static dissector_handle_t elf_handle; diff --git a/epan/dissectors/file-file.c b/epan/dissectors/file-file.c index efd35de51a..16e234654d 100644 --- a/epan/dissectors/file-file.c +++ b/epan/dissectors/file-file.c @@ -27,12 +27,8 @@ #include <windows.h> #endif -#include <glib.h> - -#include <wsutil/md5.h> - -#include <epan/epan.h> #include <epan/packet.h> +#include <epan/epan.h> #include <epan/exceptions.h> #include <epan/show_exception.h> #include <epan/timestamp.h> @@ -40,6 +36,7 @@ #include <epan/to_str.h> #include <epan/tap.h> #include <epan/expert.h> +#include <wsutil/md5.h> #include "color.h" #include "color_filters.h" diff --git a/epan/dissectors/file-gif.c b/epan/dissectors/file-gif.c index 613405c4b8..8af472d43d 100644 --- a/epan/dissectors/file-gif.c +++ b/epan/dissectors/file-gif.c @@ -39,8 +39,6 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> void proto_register_gif(void); diff --git a/epan/dissectors/file-jpeg.c b/epan/dissectors/file-jpeg.c index ae7590453f..d59991e89a 100644 --- a/epan/dissectors/file-jpeg.c +++ b/epan/dissectors/file-jpeg.c @@ -38,8 +38,6 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <wiretap/wtap.h> diff --git a/epan/dissectors/file-mp4.c b/epan/dissectors/file-mp4.c index 51e57f23a7..cdd1f90a49 100644 --- a/epan/dissectors/file-mp4.c +++ b/epan/dissectors/file-mp4.c @@ -32,9 +32,9 @@ #include "config.h" #include <math.h> -#include <glib.h> -#include <epan/expert.h> + #include <epan/packet.h> +#include <epan/expert.h> #define MAKE_TYPE_VAL(a, b, c, d) ((a)<<24 | (b)<<16 | (c)<<8 | (d)) diff --git a/epan/dissectors/file-png.c b/epan/dissectors/file-png.c index 6567b4ced9..0ed86c73ff 100644 --- a/epan/dissectors/file-png.c +++ b/epan/dissectors/file-png.c @@ -29,8 +29,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-3com-njack.c b/epan/dissectors/packet-3com-njack.c index dce98fcf33..7bd0444184 100644 --- a/epan/dissectors/packet-3com-njack.c +++ b/epan/dissectors/packet-3com-njack.c @@ -51,8 +51,6 @@ Specs: #include "config.h" -#include <glib.h> - #include <epan/packet.h> /* Forward declarations */ diff --git a/epan/dissectors/packet-3com-xns.c b/epan/dissectors/packet-3com-xns.c index 07f458b635..6ebe418ba6 100644 --- a/epan/dissectors/packet-3com-xns.c +++ b/epan/dissectors/packet-3com-xns.c @@ -23,7 +23,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-3g-a11.c b/epan/dissectors/packet-3g-a11.c index 92e51745f7..8cd50a4d07 100644 --- a/epan/dissectors/packet-3g-a11.c +++ b/epan/dissectors/packet-3g-a11.c @@ -40,11 +40,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> /* Include vendor id translation */ #include <epan/sminmpec.h> #include <epan/to_str.h> diff --git a/epan/dissectors/packet-6lowpan.c b/epan/dissectors/packet-6lowpan.c index 01e9078756..046fc7f9b9 100644 --- a/epan/dissectors/packet-6lowpan.c +++ b/epan/dissectors/packet-6lowpan.c @@ -23,7 +23,6 @@ */ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> @@ -31,7 +30,6 @@ #include <epan/ipproto.h> #include <epan/in_cksum.h> #include <epan/addr_resolv.h> -#include <epan/wmem/wmem.h> #include "packet-ipv6.h" #include "packet-ieee802154.h" #include "packet-6lowpan.h" diff --git a/epan/dissectors/packet-9p.c b/epan/dissectors/packet-9p.c index a246d02f1f..88c89dbc11 100644 --- a/epan/dissectors/packet-9p.c +++ b/epan/dissectors/packet-9p.c @@ -28,15 +28,11 @@ #include <string.h> #include <stdio.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/strutil.h> #include <epan/conversation.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> - #include "packet-tcp.h" /** diff --git a/epan/dissectors/packet-a21.c b/epan/dissectors/packet-a21.c index 27f217876c..65d60a6bb5 100644 --- a/epan/dissectors/packet-a21.c +++ b/epan/dissectors/packet-a21.c @@ -26,7 +26,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-aarp.c b/epan/dissectors/packet-aarp.c index 2c7613127a..9970f18618 100644 --- a/epan/dissectors/packet-aarp.c +++ b/epan/dissectors/packet-aarp.c @@ -26,7 +26,6 @@ #include <epan/packet.h> #include <epan/strutil.h> -#include <epan/wmem/wmem.h> #include <epan/etypes.h> #include <epan/to_str.h> diff --git a/epan/dissectors/packet-aastra-aasp.c b/epan/dissectors/packet-aastra-aasp.c index 10454f8774..c0bd431ba4 100644 --- a/epan/dissectors/packet-aastra-aasp.c +++ b/epan/dissectors/packet-aastra-aasp.c @@ -28,8 +28,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-acap.c b/epan/dissectors/packet-acap.c index 805119b402..b6716dbe2b 100644 --- a/epan/dissectors/packet-acap.c +++ b/epan/dissectors/packet-acap.c @@ -28,7 +28,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-acn.c b/epan/dissectors/packet-acn.c index f2893deab7..ba904c49e5 100644 --- a/epan/dissectors/packet-acn.c +++ b/epan/dissectors/packet-acn.c @@ -39,8 +39,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/ipv6-utils.h> diff --git a/epan/dissectors/packet-acr122.c b/epan/dissectors/packet-acr122.c index 3269223bfa..04a621f995 100644 --- a/epan/dissectors/packet-acr122.c +++ b/epan/dissectors/packet-acr122.c @@ -27,8 +27,6 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> - #include "packet-usb.h" static int proto_acr122 = -1; diff --git a/epan/dissectors/packet-actrace.c b/epan/dissectors/packet-actrace.c index 2561542cac..13f9ce543d 100644 --- a/epan/dissectors/packet-actrace.c +++ b/epan/dissectors/packet-actrace.c @@ -28,8 +28,6 @@ #include <epan/prefs.h> #include <epan/tap.h> #include "packet-actrace.h" -#include <epan/wmem/wmem.h> - #define UDP_PORT_ACTRACE 2428 #define NOT_ACTRACE 0 diff --git a/epan/dissectors/packet-adb.c b/epan/dissectors/packet-adb.c index 51df9acee4..7794ca2c32 100644 --- a/epan/dissectors/packet-adb.c +++ b/epan/dissectors/packet-adb.c @@ -27,7 +27,6 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> #include <wiretap/wtap.h> #include "packet-adb_service.h" diff --git a/epan/dissectors/packet-adb_cs.c b/epan/dissectors/packet-adb_cs.c index 197eb0715b..527e6e3804 100644 --- a/epan/dissectors/packet-adb_cs.c +++ b/epan/dissectors/packet-adb_cs.c @@ -27,7 +27,6 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> #include <wiretap/wtap.h> #include "packet-adb_service.h" diff --git a/epan/dissectors/packet-adb_service.c b/epan/dissectors/packet-adb_service.c index ff432d5374..c2525f5be8 100644 --- a/epan/dissectors/packet-adb_service.c +++ b/epan/dissectors/packet-adb_service.c @@ -27,7 +27,6 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> #include <wiretap/wtap.h> #include "packet-adb_service.h" diff --git a/epan/dissectors/packet-adwin-config.c b/epan/dissectors/packet-adwin-config.c index 8decb96b01..ac8029fc5f 100644 --- a/epan/dissectors/packet-adwin-config.c +++ b/epan/dissectors/packet-adwin-config.c @@ -25,11 +25,9 @@ #include <string.h> -#include <glib.h> #include <epan/packet.h> -#include <epan/emem.h> -#include <epan/dissectors/packet-tcp.h> #include <epan/to_str.h> +#include "packet-tcp.h" /* Forward declarations */ void proto_register_adwin_config(void); diff --git a/epan/dissectors/packet-adwin.c b/epan/dissectors/packet-adwin.c index 79223260a1..4b718c4f08 100644 --- a/epan/dissectors/packet-adwin.c +++ b/epan/dissectors/packet-adwin.c @@ -24,12 +24,9 @@ #include "config.h" /* includes needed for wireshark */ -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> - void proto_reg_handoff_adwin(void); void proto_register_adwin(void); diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c index e7abe9b16e..157e64b6de 100644 --- a/epan/dissectors/packet-afp.c +++ b/epan/dissectors/packet-afp.c @@ -28,12 +28,10 @@ #include <string.h> -#include <glib.h> #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/to_str.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> #include <epan/tap.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-afs.c b/epan/dissectors/packet-afs.c index cac9e5647f..1d5f41fbec 100644 --- a/epan/dissectors/packet-afs.c +++ b/epan/dissectors/packet-afs.c @@ -34,12 +34,9 @@ #include <stdio.h> #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/conversation.h> #include <epan/addr_resolv.h> -#include <epan/wmem/wmem.h> #include <epan/strutil.h> #include <epan/reassemble.h> diff --git a/epan/dissectors/packet-agentx.c b/epan/dissectors/packet-agentx.c index c6ec5c45a5..f525f7c961 100644 --- a/epan/dissectors/packet-agentx.c +++ b/epan/dissectors/packet-agentx.c @@ -29,7 +29,7 @@ #include <epan/prefs.h> #include <epan/to_str.h> -#include <epan/dissectors/packet-tcp.h> +#include "packet-tcp.h" static guint global_agentx_tcp_port = 705; diff --git a/epan/dissectors/packet-aim-admin.c b/epan/dissectors/packet-aim-admin.c index 79e58276c0..8789c3f57f 100644 --- a/epan/dissectors/packet-aim-admin.c +++ b/epan/dissectors/packet-aim-admin.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include "packet-aim.h" diff --git a/epan/dissectors/packet-aim-adverts.c b/epan/dissectors/packet-aim-adverts.c index 297ccdfbb6..e17a9bdb25 100644 --- a/epan/dissectors/packet-aim-adverts.c +++ b/epan/dissectors/packet-aim-adverts.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-aim-bos.c b/epan/dissectors/packet-aim-bos.c index b99d12ef92..a8fe8aa10b 100644 --- a/epan/dissectors/packet-aim-bos.c +++ b/epan/dissectors/packet-aim-bos.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include "packet-aim.h" diff --git a/epan/dissectors/packet-aim-buddylist.c b/epan/dissectors/packet-aim-buddylist.c index b8ebc8acb0..bf49e07968 100644 --- a/epan/dissectors/packet-aim-buddylist.c +++ b/epan/dissectors/packet-aim-buddylist.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-aim-chat.c b/epan/dissectors/packet-aim-chat.c index a9aba7e2b6..1130de9017 100644 --- a/epan/dissectors/packet-aim-chat.c +++ b/epan/dissectors/packet-aim-chat.c @@ -24,12 +24,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/strutil.h> -#include <epan/wmem/wmem.h> - #include "packet-tcp.h" #include "packet-aim.h" diff --git a/epan/dissectors/packet-aim-chatnav.c b/epan/dissectors/packet-aim-chatnav.c index de8c0b9033..764f8189ee 100644 --- a/epan/dissectors/packet-aim-chatnav.c +++ b/epan/dissectors/packet-aim-chatnav.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-aim-directory.c b/epan/dissectors/packet-aim-directory.c index 523aec0331..648eed79a4 100644 --- a/epan/dissectors/packet-aim-directory.c +++ b/epan/dissectors/packet-aim-directory.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-aim-email.c b/epan/dissectors/packet-aim-email.c index 40a8343f7a..2327de7ab6 100644 --- a/epan/dissectors/packet-aim-email.c +++ b/epan/dissectors/packet-aim-email.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include "packet-aim.h" diff --git a/epan/dissectors/packet-aim-generic.c b/epan/dissectors/packet-aim-generic.c index 1911823270..608e483920 100644 --- a/epan/dissectors/packet-aim-generic.c +++ b/epan/dissectors/packet-aim-generic.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include "packet-aim.h" diff --git a/epan/dissectors/packet-aim-icq.c b/epan/dissectors/packet-aim-icq.c index 30062f3981..18994b3939 100644 --- a/epan/dissectors/packet-aim-icq.c +++ b/epan/dissectors/packet-aim-icq.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-aim-invitation.c b/epan/dissectors/packet-aim-invitation.c index 1381cbc748..51966d0d07 100644 --- a/epan/dissectors/packet-aim-invitation.c +++ b/epan/dissectors/packet-aim-invitation.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include "packet-aim.h" diff --git a/epan/dissectors/packet-aim-location.c b/epan/dissectors/packet-aim-location.c index bcd8856e6e..b7f379e05a 100644 --- a/epan/dissectors/packet-aim-location.c +++ b/epan/dissectors/packet-aim-location.c @@ -24,8 +24,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include "packet-aim.h" diff --git a/epan/dissectors/packet-aim-messaging.c b/epan/dissectors/packet-aim-messaging.c index f772c1f172..975899e784 100644 --- a/epan/dissectors/packet-aim-messaging.c +++ b/epan/dissectors/packet-aim-messaging.c @@ -26,8 +26,6 @@ #include "config.h" -#include <glib.h> - #include <string.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-aim-oft.c b/epan/dissectors/packet-aim-oft.c index 1aeb65afd3..503e969855 100644 --- a/epan/dissectors/packet-aim-oft.c +++ b/epan/dissectors/packet-aim-oft.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-aim-popup.c b/epan/dissectors/packet-aim-popup.c index fd20afa7af..392da1a802 100644 --- a/epan/dissectors/packet-aim-popup.c +++ b/epan/dissectors/packet-aim-popup.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-aim-signon.c b/epan/dissectors/packet-aim-signon.c index 9dd02febcf..5acfa98b17 100644 --- a/epan/dissectors/packet-aim-signon.c +++ b/epan/dissectors/packet-aim-signon.c @@ -24,8 +24,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-aim-ssi.c b/epan/dissectors/packet-aim-ssi.c index df03b6f7ca..bf4861d047 100644 --- a/epan/dissectors/packet-aim-ssi.c +++ b/epan/dissectors/packet-aim-ssi.c @@ -24,8 +24,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include "packet-aim.h" diff --git a/epan/dissectors/packet-aim-sst.c b/epan/dissectors/packet-aim-sst.c index 1f4ff5d908..e76aefcf79 100644 --- a/epan/dissectors/packet-aim-sst.c +++ b/epan/dissectors/packet-aim-sst.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-aim-stats.c b/epan/dissectors/packet-aim-stats.c index 23dcff1288..2fcdf5b243 100644 --- a/epan/dissectors/packet-aim-stats.c +++ b/epan/dissectors/packet-aim-stats.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include "packet-aim.h" diff --git a/epan/dissectors/packet-aim-translate.c b/epan/dissectors/packet-aim-translate.c index 313d033d4d..625d3a871b 100644 --- a/epan/dissectors/packet-aim-translate.c +++ b/epan/dissectors/packet-aim-translate.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include "packet-aim.h" diff --git a/epan/dissectors/packet-aim-userlookup.c b/epan/dissectors/packet-aim-userlookup.c index 111d82ead0..55d3df826f 100644 --- a/epan/dissectors/packet-aim-userlookup.c +++ b/epan/dissectors/packet-aim-userlookup.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c index 1b271b2bb5..c659c57330 100644 --- a/epan/dissectors/packet-aim.c +++ b/epan/dissectors/packet-aim.c @@ -27,8 +27,6 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/strutil.h> #include <epan/to_str.h> diff --git a/epan/dissectors/packet-ajp13.c b/epan/dissectors/packet-ajp13.c index 95e1accd78..ffeb60a6a1 100644 --- a/epan/dissectors/packet-ajp13.c +++ b/epan/dissectors/packet-ajp13.c @@ -25,10 +25,7 @@ #include <stdlib.h> -#include <glib.h> - #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include <epan/conversation.h> #include "packet-tcp.h" diff --git a/epan/dissectors/packet-alcap.c b/epan/dissectors/packet-alcap.c index bb78c8fa21..7be45e4c89 100644 --- a/epan/dissectors/packet-alcap.c +++ b/epan/dissectors/packet-alcap.c @@ -29,17 +29,14 @@ #include "config.h" -#include <glib.h> - -#include <wsutil/str_util.h> - #include <epan/packet.h> -#include <epan/wmem/wmem.h> + #include <epan/prefs.h> +#include <epan/expert.h> +#include <wsutil/str_util.h> #include "packet-alcap.h" #include "packet-mtp3.h" -#include <epan/dissectors/packet-isup.h> -#include <epan/expert.h> +#include "packet-isup.h" void proto_register_alcap(void); void proto_reg_handoff_alcap(void); diff --git a/epan/dissectors/packet-alljoyn.c b/epan/dissectors/packet-alljoyn.c index a86f444ac0..4211e84e4f 100644 --- a/epan/dissectors/packet-alljoyn.c +++ b/epan/dissectors/packet-alljoyn.c @@ -24,8 +24,6 @@ #include "config.h" #include <epan/packet.h> -#include <glib.h> - void proto_register_AllJoyn(void); void proto_reg_handoff_AllJoyn(void); diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c index 14159839af..7362ee87e3 100644 --- a/epan/dissectors/packet-amqp.c +++ b/epan/dissectors/packet-amqp.c @@ -37,12 +37,10 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/expert.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> #include "packet-tcp.h" diff --git a/epan/dissectors/packet-amr.c b/epan/dissectors/packet-amr.c index bd386c473b..e68226da86 100644 --- a/epan/dissectors/packet-amr.c +++ b/epan/dissectors/packet-amr.c @@ -28,8 +28,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include <epan/oids.h> diff --git a/epan/dissectors/packet-ancp.c b/epan/dissectors/packet-ancp.c index d432c078ff..24e756b9f5 100644 --- a/epan/dissectors/packet-ancp.c +++ b/epan/dissectors/packet-ancp.c @@ -30,10 +30,9 @@ #include "config.h" #include <epan/packet.h> -#include <epan/wmem/wmem.h> -#include <epan/dissectors/packet-tcp.h> #include <epan/tap.h> #include <epan/stats_tree.h> +#include "packet-tcp.h" #define ANCP_PORT 6068 /* The ANCP TCP port:draft-ietf-ancp-protocol-09.txt */ diff --git a/epan/dissectors/packet-ans.c b/epan/dissectors/packet-ans.c index c10c3fdc4d..ce00f1daec 100644 --- a/epan/dissectors/packet-ans.c +++ b/epan/dissectors/packet-ans.c @@ -43,11 +43,9 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/to_str.h> -#include <etypes.h> +#include <epan/etypes.h> void proto_register_ans(void); void proto_reg_handoff_ans(void); diff --git a/epan/dissectors/packet-ansi_637.c b/epan/dissectors/packet-ansi_637.c index 8710acf120..09774f3b27 100644 --- a/epan/dissectors/packet-ansi_637.c +++ b/epan/dissectors/packet-ansi_637.c @@ -39,11 +39,9 @@ #include "config.h" #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include <epan/expert.h> #include <epan/strutil.h> #include <epan/to_str.h> -#include <epan/tfs.h> #include "packet-gsm_sms.h" #include "packet-ansi_a.h" diff --git a/epan/dissectors/packet-ansi_801.c b/epan/dissectors/packet-ansi_801.c index 187fd0baf4..0aadcd4291 100644 --- a/epan/dissectors/packet-ansi_801.c +++ b/epan/dissectors/packet-ansi_801.c @@ -35,11 +35,9 @@ #include <stdlib.h> -#include <glib.h> #include <math.h> #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include <epan/to_str.h> void proto_register_ansi_801(void); diff --git a/epan/dissectors/packet-ansi_a.c b/epan/dissectors/packet-ansi_a.c index 9d1c255c73..b323bd4eec 100644 --- a/epan/dissectors/packet-ansi_a.c +++ b/epan/dissectors/packet-ansi_a.c @@ -46,9 +46,7 @@ #include <epan/prefs.h> #include <epan/tap.h> #include <epan/strutil.h> -#include <epan/wmem/wmem.h> #include <epan/expert.h> -#include <epan/tfs.h> #include <epan/to_str.h> #include "packet-mtp3.h" diff --git a/epan/dissectors/packet-aodv.c b/epan/dissectors/packet-aodv.c index 8afec3e250..6f03755a38 100644 --- a/epan/dissectors/packet-aodv.c +++ b/epan/dissectors/packet-aodv.c @@ -27,8 +27,6 @@ #include <stddef.h> #endif -#include <glib.h> - #include <epan/packet.h> #include <epan/to_str.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-aoe.c b/epan/dissectors/packet-aoe.c index d10299c07f..624cb79980 100644 --- a/epan/dissectors/packet-aoe.c +++ b/epan/dissectors/packet-aoe.c @@ -19,12 +19,9 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include <epan/conversation.h> -#include <etypes.h> +#include <epan/etypes.h> void proto_register_aoe(void); void proto_reg_handoff_aoe(void); diff --git a/epan/dissectors/packet-aol.c b/epan/dissectors/packet-aol.c index 71983fef75..b55a1e184e 100644 --- a/epan/dissectors/packet-aol.c +++ b/epan/dissectors/packet-aol.c @@ -24,9 +24,7 @@ #include "config.h" #include <stdio.h> -#include <glib.h> #include <epan/packet.h> -#include <epan/emem.h> #include <epan/prefs.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-ap1394.c b/epan/dissectors/packet-ap1394.c index cc6e81e390..ef2ee45b97 100644 --- a/epan/dissectors/packet-ap1394.c +++ b/epan/dissectors/packet-ap1394.c @@ -22,7 +22,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <wsutil/pint.h> #include <epan/addr_resolv.h> diff --git a/epan/dissectors/packet-app-pkix-cert.c b/epan/dissectors/packet-app-pkix-cert.c index 42c17842b2..595ab0d3fa 100644 --- a/epan/dissectors/packet-app-pkix-cert.c +++ b/epan/dissectors/packet-app-pkix-cert.c @@ -28,11 +28,9 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/asn1.h> -#include <epan/dissectors/packet-x509af.h> +#include "packet-x509af.h" void proto_register_cert(void); diff --git a/epan/dissectors/packet-applemidi.c b/epan/dissectors/packet-applemidi.c index f90336d6ad..f79f11ab8a 100644 --- a/epan/dissectors/packet-applemidi.c +++ b/epan/dissectors/packet-applemidi.c @@ -48,9 +48,7 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include <epan/conversation.h> #include "packet-rtp.h" diff --git a/epan/dissectors/packet-aprs.c b/epan/dissectors/packet-aprs.c index eaee53a813..ed589b400d 100644 --- a/epan/dissectors/packet-aprs.c +++ b/epan/dissectors/packet-aprs.c @@ -42,12 +42,8 @@ #include <string.h> #include <math.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> - #define AX25_ADDR_LEN 7 /* length of an AX.25 address */ #define STRLEN 100 diff --git a/epan/dissectors/packet-ar_drone.c b/epan/dissectors/packet-ar_drone.c index d6949a1e73..445e972ba2 100644 --- a/epan/dissectors/packet-ar_drone.c +++ b/epan/dissectors/packet-ar_drone.c @@ -26,8 +26,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-arcnet.c b/epan/dissectors/packet-arcnet.c index 9c3f0bf58c..67e3de0559 100644 --- a/epan/dissectors/packet-arcnet.c +++ b/epan/dissectors/packet-arcnet.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <wiretap/wtap.h> #include "packet-arcnet.h" diff --git a/epan/dissectors/packet-armagetronad.c b/epan/dissectors/packet-armagetronad.c index 8a57fa7ee5..f382528a92 100644 --- a/epan/dissectors/packet-armagetronad.c +++ b/epan/dissectors/packet-armagetronad.c @@ -23,11 +23,7 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <epan/wmem/wmem.h> - void proto_register_armagetronad(void); void proto_reg_handoff_armagetronad(void); diff --git a/epan/dissectors/packet-arp.c b/epan/dissectors/packet-arp.c index 00cc88def7..68fab05bae 100644 --- a/epan/dissectors/packet-arp.c +++ b/epan/dissectors/packet-arp.c @@ -26,12 +26,10 @@ #include "config.h" #include <string.h> -#include <glib.h> #include <epan/packet.h> #include <epan/strutil.h> #include <epan/arptypes.h> #include <epan/addr_resolv.h> -#include <epan/wmem/wmem.h> #include "packet-arp.h" #include <epan/etypes.h> #include <epan/arcnet_pids.h> diff --git a/epan/dissectors/packet-artnet.c b/epan/dissectors/packet-artnet.c index 9b7db37fff..cabd172368 100644 --- a/epan/dissectors/packet-artnet.c +++ b/epan/dissectors/packet-artnet.c @@ -25,10 +25,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <epan/dissectors/packet-rdm.h> +#include "packet-rdm.h" /* * See diff --git a/epan/dissectors/packet-aruba-adp.c b/epan/dissectors/packet-aruba-adp.c index 46ed844adb..5eed96cd22 100644 --- a/epan/dissectors/packet-aruba-adp.c +++ b/epan/dissectors/packet-aruba-adp.c @@ -24,7 +24,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/addr_resolv.h> diff --git a/epan/dissectors/packet-aruba-erm.c b/epan/dissectors/packet-aruba-erm.c index bd2502542e..776edce325 100644 --- a/epan/dissectors/packet-aruba-erm.c +++ b/epan/dissectors/packet-aruba-erm.c @@ -57,7 +57,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-aruba-iap.c b/epan/dissectors/packet-aruba-iap.c index c5b877101b..dfb24536aa 100644 --- a/epan/dissectors/packet-aruba-iap.c +++ b/epan/dissectors/packet-aruba-iap.c @@ -31,7 +31,6 @@ */ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/addr_resolv.h> diff --git a/epan/dissectors/packet-aruba-papi.c b/epan/dissectors/packet-aruba-papi.c index 4dcb2d886b..275bdf10ca 100644 --- a/epan/dissectors/packet-aruba-papi.c +++ b/epan/dissectors/packet-aruba-papi.c @@ -31,8 +31,6 @@ #include <string.h> #endif -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-ascend.c b/epan/dissectors/packet-ascend.c index b2afa1055e..15419de9c9 100644 --- a/epan/dissectors/packet-ascend.c +++ b/epan/dissectors/packet-ascend.c @@ -21,8 +21,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <wiretap/wtap.h> diff --git a/epan/dissectors/packet-asf.c b/epan/dissectors/packet-asf.c index 7d317b9c02..2141e3318a 100644 --- a/epan/dissectors/packet-asf.c +++ b/epan/dissectors/packet-asf.c @@ -26,7 +26,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include <epan/sminmpec.h> diff --git a/epan/dissectors/packet-assa_r3.c b/epan/dissectors/packet-assa_r3.c index 5208200e4a..18abebb2ae 100644 --- a/epan/dissectors/packet-assa_r3.c +++ b/epan/dissectors/packet-assa_r3.c @@ -26,11 +26,9 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> -#include <epan/dissectors/packet-tcp.h> +#include "packet-tcp.h" void proto_register_r3(void); void proto_reg_handoff_r3(void); diff --git a/epan/dissectors/packet-asterix.c b/epan/dissectors/packet-asterix.c index 1038e0cff1..df14f06b70 100644 --- a/epan/dissectors/packet-asterix.c +++ b/epan/dissectors/packet-asterix.c @@ -23,12 +23,10 @@ #include "config.h" -#include <glib.h> -#include <epan/packet.h> -#include <epan/prefs.h> -#include "wmem/wmem.h" #include <stdio.h> +#include <epan/packet.h> +#include <epan/prefs.h> void proto_register_asterix(void); void proto_reg_handoff_asterix(void); diff --git a/epan/dissectors/packet-at.c b/epan/dissectors/packet-at.c index 95445c944c..bc5af4e6d8 100644 --- a/epan/dissectors/packet-at.c +++ b/epan/dissectors/packet-at.c @@ -25,7 +25,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> void proto_register_at_command(void); diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c index 22c0b37a28..e7f74bc709 100644 --- a/epan/dissectors/packet-atalk.c +++ b/epan/dissectors/packet-atalk.c @@ -25,22 +25,18 @@ #include "config.h" -#include <glib.h> -#include <epan/packet.h> #include <string.h> +#include <epan/packet.h> #include <epan/etypes.h> #include <epan/ppptypes.h> #include <epan/aftypes.h> #include <epan/arcnet_pids.h> #include <epan/atalk-utils.h> #include <epan/conversation.h> -#include <wiretap/wtap.h> - #include <epan/prefs.h> #include <epan/reassemble.h> -#include <epan/wmem/wmem.h> - +#include <wiretap/wtap.h> #include "packet-atalk.h" #include "packet-afp.h" diff --git a/epan/dissectors/packet-atm.c b/epan/dissectors/packet-atm.c index 3acffeb20e..8ff4423f9b 100644 --- a/epan/dissectors/packet-atm.c +++ b/epan/dissectors/packet-atm.c @@ -22,7 +22,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <wsutil/pint.h> #include <epan/oui.h> diff --git a/epan/dissectors/packet-atmtcp.c b/epan/dissectors/packet-atmtcp.c index eccbc0ebac..9c4cded96d 100644 --- a/epan/dissectors/packet-atmtcp.c +++ b/epan/dissectors/packet-atmtcp.c @@ -28,8 +28,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-auto_rp.c b/epan/dissectors/packet-auto_rp.c index ef3ea44e8f..25a6e54797 100644 --- a/epan/dissectors/packet-auto_rp.c +++ b/epan/dissectors/packet-auto_rp.c @@ -25,7 +25,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/to_str.h> diff --git a/epan/dissectors/packet-ax25-kiss.c b/epan/dissectors/packet-ax25-kiss.c index 77c342dc99..b794361e50 100644 --- a/epan/dissectors/packet-ax25-kiss.c +++ b/epan/dissectors/packet-ax25-kiss.c @@ -101,12 +101,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <wiretap/wtap.h> -#include <epan/wmem/wmem.h> - #include "packet-ax25-kiss.h" #include "packet-ax25.h" diff --git a/epan/dissectors/packet-ax25-nol3.c b/epan/dissectors/packet-ax25-nol3.c index f237125db1..26d28cbd8b 100644 --- a/epan/dissectors/packet-ax25-nol3.c +++ b/epan/dissectors/packet-ax25-nol3.c @@ -46,11 +46,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> #include <epan/ax25_pids.h> #define STRLEN 80 diff --git a/epan/dissectors/packet-ax25.c b/epan/dissectors/packet-ax25.c index 87c416ac29..e51ed64d18 100644 --- a/epan/dissectors/packet-ax25.c +++ b/epan/dissectors/packet-ax25.c @@ -44,17 +44,13 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <wiretap/wtap.h> #include <epan/to_str.h> -#include <epan/wmem/wmem.h> #include <epan/xdlc.h> #include <epan/ax25_pids.h> #include <epan/ipproto.h> -#include <packet-ip.h> - +#include "packet-ip.h" #include "packet-ax25.h" #include "packet-netrom.h" diff --git a/epan/dissectors/packet-ax4000.c b/epan/dissectors/packet-ax4000.c index cd892825da..a7c11dc114 100644 --- a/epan/dissectors/packet-ax4000.c +++ b/epan/dissectors/packet-ax4000.c @@ -23,10 +23,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <ipproto.h> +#include <epan/ipproto.h> void proto_register_ax4000(void); void proto_reg_handoff_ax4000(void); diff --git a/epan/dissectors/packet-ayiya.c b/epan/dissectors/packet-ayiya.c index 3cd47e17f3..da483cc865 100644 --- a/epan/dissectors/packet-ayiya.c +++ b/epan/dissectors/packet-ayiya.c @@ -25,7 +25,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/ipproto.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-babel.c b/epan/dissectors/packet-babel.c index 2a01a1efc4..65910db306 100644 --- a/epan/dissectors/packet-babel.c +++ b/epan/dissectors/packet-babel.c @@ -23,12 +23,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/to_str.h> -#include <epan/wmem/wmem.h> - void proto_register_babel(void); void proto_reg_handoff_babel(void); diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c index 0cb6da0c72..8c9d8b7ede 100644 --- a/epan/dissectors/packet-bacapp.c +++ b/epan/dissectors/packet-bacapp.c @@ -27,11 +27,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/to_str.h> -#include <epan/wmem/wmem.h> #include <epan/reassemble.h> #include <epan/expert.h> #include <epan/stats_tree.h> diff --git a/epan/dissectors/packet-bacnet.c b/epan/dissectors/packet-bacnet.c index ba4ad9ae15..15f9311947 100644 --- a/epan/dissectors/packet-bacnet.c +++ b/epan/dissectors/packet-bacnet.c @@ -26,8 +26,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/llcsaps.h> diff --git a/epan/dissectors/packet-banana.c b/epan/dissectors/packet-banana.c index 76dd785e69..076a98a2b2 100644 --- a/epan/dissectors/packet-banana.c +++ b/epan/dissectors/packet-banana.c @@ -28,8 +28,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-bat.c b/epan/dissectors/packet-bat.c index 5d8341e311..54b9dfe046 100644 --- a/epan/dissectors/packet-bat.c +++ b/epan/dissectors/packet-bat.c @@ -27,8 +27,6 @@ #include <epan/prefs.h> #include <epan/tap.h> #include <epan/addr_resolv.h> -#include <epan/wmem/wmem.h> - void proto_register_bat(void); void proto_reg_handoff_bat(void); diff --git a/epan/dissectors/packet-batadv.c b/epan/dissectors/packet-batadv.c index 0e472333a4..2f5245d843 100644 --- a/epan/dissectors/packet-batadv.c +++ b/epan/dissectors/packet-batadv.c @@ -28,7 +28,6 @@ #include <epan/tap.h> #include <epan/addr_resolv.h> #include <epan/reassemble.h> -#include <epan/wmem/wmem.h> #include <epan/expert.h> /* Start content from packet-batadv.h */ diff --git a/epan/dissectors/packet-bctp.c b/epan/dissectors/packet-bctp.c index 9bbeffe5a1..99e82154aa 100644 --- a/epan/dissectors/packet-bctp.c +++ b/epan/dissectors/packet-bctp.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #define PNAME "BCTP Q.1990" diff --git a/epan/dissectors/packet-beep.c b/epan/dissectors/packet-beep.c index 08f0b18207..ff8671ca2c 100644 --- a/epan/dissectors/packet-beep.c +++ b/epan/dissectors/packet-beep.c @@ -29,12 +29,10 @@ #include "config.h" #include <stdio.h> -#include <glib.h> #include <epan/packet.h> #include <epan/addr_resolv.h> #include <epan/prefs.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> #include <epan/expert.h> #define TCP_PORT_BEEP 10288 diff --git a/epan/dissectors/packet-bencode.c b/epan/dissectors/packet-bencode.c index e85bb6dd31..bd615523a4 100644 --- a/epan/dissectors/packet-bencode.c +++ b/epan/dissectors/packet-bencode.c @@ -25,7 +25,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index be99417381..26c8da7f89 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -59,8 +59,6 @@ #include <stdio.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/strutil.h> @@ -71,7 +69,6 @@ #include <epan/expert.h> #include <epan/uat.h> #include <epan/asn1.h> -#include <epan/wmem/wmem.h> #include <epan/decode_as.h> #include <wiretap/wtap.h> diff --git a/epan/dissectors/packet-bfcp.c b/epan/dissectors/packet-bfcp.c index 78317e3a2b..8ef8bcdd27 100644 --- a/epan/dissectors/packet-bfcp.c +++ b/epan/dissectors/packet-bfcp.c @@ -27,8 +27,6 @@ */ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-bfd.c b/epan/dissectors/packet-bfd.c index 379c314762..bb9345be4f 100644 --- a/epan/dissectors/packet-bfd.c +++ b/epan/dissectors/packet-bfd.c @@ -34,8 +34,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c index 7c900effcd..95eab1c089 100644 --- a/epan/dissectors/packet-bgp.c +++ b/epan/dissectors/packet-bgp.c @@ -58,20 +58,17 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/addr_and_mask.h> #include <epan/show_exception.h> #include <epan/afn.h> -#include <epan/dissectors/packet-ldp.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> #include <epan/expert.h> #include <epan/etypes.h> #include <epan/to_str.h> -#include <packet-ip.h> +#include "packet-ip.h" +#include "packet-ldp.h" void proto_register_bgp(void); void proto_reg_handoff_bgp(void); diff --git a/epan/dissectors/packet-bitcoin.c b/epan/dissectors/packet-bitcoin.c index f057c4e873..773f558394 100644 --- a/epan/dissectors/packet-bitcoin.c +++ b/epan/dissectors/packet-bitcoin.c @@ -28,8 +28,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-bittorrent.c b/epan/dissectors/packet-bittorrent.c index 49a514898b..3c889a49f6 100644 --- a/epan/dissectors/packet-bittorrent.c +++ b/epan/dissectors/packet-bittorrent.c @@ -25,10 +25,9 @@ #include "config.h" -#include <glib.h> +#include <epan/packet.h> #include <epan/prefs.h> #include <epan/conversation.h> -#include <epan/packet.h> #include <epan/strutil.h> #include "packet-tcp.h" diff --git a/epan/dissectors/packet-bjnp.c b/epan/dissectors/packet-bjnp.c index 56500be783..9d10590d12 100644 --- a/epan/dissectors/packet-bjnp.c +++ b/epan/dissectors/packet-bjnp.c @@ -25,8 +25,6 @@ #include "config.h" #include <epan/packet.h> -#include <epan/wmem/wmem.h> - #define PNAME "Canon BJNP" #define PSNAME "BJNP" #define PFNAME "bjnp" diff --git a/epan/dissectors/packet-bmc.c b/epan/dissectors/packet-bmc.c index 03ad16e59d..5fb5c7d03d 100644 --- a/epan/dissectors/packet-bmc.c +++ b/epan/dissectors/packet-bmc.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <wsutil/bitswap.h> #include <epan/asn1.h> /* needed for packet-gsm_map.h */ diff --git a/epan/dissectors/packet-bofl.c b/epan/dissectors/packet-bofl.c index 3b09a54bb1..c0896a0274 100644 --- a/epan/dissectors/packet-bofl.c +++ b/epan/dissectors/packet-bofl.c @@ -40,8 +40,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #define ETHER_TYPE_BOFL 0x8102 diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c index cf444d9379..9cb6997751 100644 --- a/epan/dissectors/packet-bootp.c +++ b/epan/dissectors/packet-bootp.c @@ -110,8 +110,6 @@ #include <stdlib.h> #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include "packet-arp.h" @@ -123,8 +121,6 @@ #include <epan/sminmpec.h> #include <epan/expert.h> #include <epan/uat.h> -#include <epan/wmem/wmem.h> - void proto_register_bootp(void); void proto_reg_handoff_bootp(void); diff --git a/epan/dissectors/packet-bpdu.c b/epan/dissectors/packet-bpdu.c index 0a4b9203d2..7027f1ce38 100644 --- a/epan/dissectors/packet-bpdu.c +++ b/epan/dissectors/packet-bpdu.c @@ -24,7 +24,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/llcsaps.h> #include <epan/ppptypes.h> diff --git a/epan/dissectors/packet-bpq.c b/epan/dissectors/packet-bpq.c index 0413da202c..4ce736dd03 100644 --- a/epan/dissectors/packet-bpq.c +++ b/epan/dissectors/packet-bpq.c @@ -35,8 +35,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-brdwlk.c b/epan/dissectors/packet-brdwlk.c index fa6368ee76..671c77160b 100644 --- a/epan/dissectors/packet-brdwlk.c +++ b/epan/dissectors/packet-brdwlk.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/etypes.h> #include "packet-fc.h" diff --git a/epan/dissectors/packet-brp.c b/epan/dissectors/packet-brp.c index d1cdc3c796..9ae4ff24eb 100644 --- a/epan/dissectors/packet-brp.c +++ b/epan/dissectors/packet-brp.c @@ -28,7 +28,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-bssap.c b/epan/dissectors/packet-bssap.c index 63dcec5c49..1a300148ae 100644 --- a/epan/dissectors/packet-bssap.c +++ b/epan/dissectors/packet-bssap.c @@ -31,13 +31,9 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> - #include "packet-bssap.h" #include "packet-sccp.h" #include "packet-gsm_a_common.h" diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c index 259a3d63bf..071425a1a0 100644 --- a/epan/dissectors/packet-bssgp.c +++ b/epan/dissectors/packet-bssgp.c @@ -25,10 +25,9 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> -#include <prefs.h> +#include <epan/prefs.h> #include <epan/asn1.h> #include "packet-bssgp.h" diff --git a/epan/dissectors/packet-bt-dht.c b/epan/dissectors/packet-bt-dht.c index 70c017dcb7..e6089bc56a 100644 --- a/epan/dissectors/packet-bt-dht.c +++ b/epan/dissectors/packet-bt-dht.c @@ -31,7 +31,6 @@ #include <epan/packet.h> #include <epan/conversation.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> #include <epan/to_str.h> void proto_register_bt_dht(void); diff --git a/epan/dissectors/packet-btavctp.c b/epan/dissectors/packet-btavctp.c index d96e25d0c6..0f614d8707 100644 --- a/epan/dissectors/packet-btavctp.c +++ b/epan/dissectors/packet-btavctp.c @@ -27,7 +27,6 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> #include <epan/decode_as.h> #include "packet-bluetooth.h" diff --git a/epan/dissectors/packet-btavdtp.c b/epan/dissectors/packet-btavdtp.c index ea63ef335a..8428027b15 100644 --- a/epan/dissectors/packet-btavdtp.c +++ b/epan/dissectors/packet-btavdtp.c @@ -27,7 +27,6 @@ #include <epan/packet.h> #include <epan/expert.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> #include <wiretap/wtap.h> #include "packet-bluetooth.h" diff --git a/epan/dissectors/packet-btavrcp.c b/epan/dissectors/packet-btavrcp.c index eb0c6edd40..ac8e3b1db2 100644 --- a/epan/dissectors/packet-btavrcp.c +++ b/epan/dissectors/packet-btavrcp.c @@ -28,8 +28,6 @@ #include <epan/prefs.h> #include <epan/expert.h> #include <epan/oui.h> -#include <epan/wmem/wmem.h> - #include "packet-wap.h" #include "packet-btl2cap.h" #include "packet-btsdp.h" diff --git a/epan/dissectors/packet-bthci_acl.c b/epan/dissectors/packet-bthci_acl.c index f0d04de80f..fffaf37d9d 100644 --- a/epan/dissectors/packet-bthci_acl.c +++ b/epan/dissectors/packet-bthci_acl.c @@ -30,7 +30,6 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/addr_resolv.h> -#include <epan/wmem/wmem.h> #include <epan/expert.h> #include "packet-bluetooth.h" diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c index ae17f8e41f..2e74ddb8f9 100644 --- a/epan/dissectors/packet-bthci_evt.c +++ b/epan/dissectors/packet-bthci_evt.c @@ -34,7 +34,6 @@ #include <epan/packet.h> #include <epan/addr_resolv.h> -#include <epan/wmem/wmem.h> #include <epan/expert.h> #include <epan/prefs.h> #include <epan/decode_as.h> diff --git a/epan/dissectors/packet-bthci_sco.c b/epan/dissectors/packet-bthci_sco.c index 0bb1b02cd5..a89f689cd6 100644 --- a/epan/dissectors/packet-bthci_sco.c +++ b/epan/dissectors/packet-bthci_sco.c @@ -28,7 +28,6 @@ #include <epan/packet.h> #include <epan/addr_resolv.h> -#include <epan/wmem/wmem.h> #include <wiretap/wtap.h> #include "packet-bluetooth.h" diff --git a/epan/dissectors/packet-bthfp.c b/epan/dissectors/packet-bthfp.c index 63cdf51c13..df7263afce 100644 --- a/epan/dissectors/packet-bthfp.c +++ b/epan/dissectors/packet-bthfp.c @@ -32,8 +32,6 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> - #include "packet-btrfcomm.h" #include "packet-btsdp.h" diff --git a/epan/dissectors/packet-bthsp.c b/epan/dissectors/packet-bthsp.c index 7469933039..3f8c1b8099 100644 --- a/epan/dissectors/packet-bthsp.c +++ b/epan/dissectors/packet-bthsp.c @@ -27,8 +27,6 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> - #include "packet-btrfcomm.h" #include "packet-btsdp.h" diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c index 054c679c11..244b803890 100644 --- a/epan/dissectors/packet-btl2cap.c +++ b/epan/dissectors/packet-btl2cap.c @@ -30,7 +30,6 @@ #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> #include <epan/decode_as.h> #include <wiretap/wtap.h> diff --git a/epan/dissectors/packet-btobex.c b/epan/dissectors/packet-btobex.c index 4b0033cea0..c36e3b7ec1 100644 --- a/epan/dissectors/packet-btobex.c +++ b/epan/dissectors/packet-btobex.c @@ -29,8 +29,6 @@ #include <epan/reassemble.h> #include <epan/tap.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> - #include "packet-bluetooth.h" #include "packet-btrfcomm.h" #include "packet-btl2cap.h" diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c index 3d26c7b6b5..946fcc2cab 100644 --- a/epan/dissectors/packet-btrfcomm.c +++ b/epan/dissectors/packet-btrfcomm.c @@ -35,7 +35,6 @@ #include <epan/prefs.h> #include <epan/expert.h> #include <epan/uat.h> -#include <epan/wmem/wmem.h> #include <epan/decode_as.h> #include "packet-bluetooth.h" diff --git a/epan/dissectors/packet-btsap.c b/epan/dissectors/packet-btsap.c index b8ffb403a5..42d54f0249 100644 --- a/epan/dissectors/packet-btsap.c +++ b/epan/dissectors/packet-btsap.c @@ -27,8 +27,6 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> - #include "packet-btl2cap.h" #include "packet-btsdp.h" diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c index bf9aa5aa06..b05a36e485 100644 --- a/epan/dissectors/packet-btsdp.c +++ b/epan/dissectors/packet-btsdp.c @@ -35,7 +35,6 @@ #include <epan/prefs.h> #include <epan/etypes.h> #include <epan/ip_opts.h> -#include <epan/wmem/wmem.h> #include <epan/strutil.h> #include <epan/to_str.h> diff --git a/epan/dissectors/packet-bvlc.c b/epan/dissectors/packet-bvlc.c index fe6c431dab..88804e381b 100644 --- a/epan/dissectors/packet-bvlc.c +++ b/epan/dissectors/packet-bvlc.c @@ -25,13 +25,10 @@ #include "config.h" +#include <epan/packet.h> #include <epan/prefs.h> #include <epan/strutil.h> -#include <glib.h> - -#include <epan/packet.h> - void proto_register_bvlc(void); void proto_reg_handoff_bvlc(void); diff --git a/epan/dissectors/packet-bzr.c b/epan/dissectors/packet-bzr.c index 7693d5a45e..66ea9d5b16 100644 --- a/epan/dissectors/packet-bzr.c +++ b/epan/dissectors/packet-bzr.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> #include "packet-tcp.h" diff --git a/epan/dissectors/packet-canopen.c b/epan/dissectors/packet-canopen.c index 3f36e85d09..60878d4faa 100644 --- a/epan/dissectors/packet-canopen.c +++ b/epan/dissectors/packet-canopen.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> void proto_register_canopen(void); diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c index a6a60c681d..c1df7ee132 100644 --- a/epan/dissectors/packet-capwap.c +++ b/epan/dissectors/packet-capwap.c @@ -23,15 +23,13 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/reassemble.h> #include <epan/expert.h> #include <epan/sminmpec.h> -#include <epan/dissectors/packet-ieee80211.h> +#include "packet-ieee80211.h" void proto_register_capwap_control(void); void proto_reg_handoff_capwap(void); diff --git a/epan/dissectors/packet-carp.c b/epan/dissectors/packet-carp.c index e1bce1f091..8975ad2a0a 100644 --- a/epan/dissectors/packet-carp.c +++ b/epan/dissectors/packet-carp.c @@ -24,7 +24,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/ipproto.h> #include <epan/in_cksum.h> diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index 28307ecce5..93c99ba3f8 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -22,15 +22,12 @@ #include "config.h" -#include <glib.h> - #include <stdio.h> #include <stdlib.h> #include <epan/packet.h> #include <epan/conversation.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> #include <epan/ipproto.h> #include <epan/prefs.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-ccsds.c b/epan/dissectors/packet-ccsds.c index 34ad3e0426..3405bdb2b6 100644 --- a/epan/dissectors/packet-ccsds.c +++ b/epan/dissectors/packet-ccsds.c @@ -24,8 +24,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-cdp.c b/epan/dissectors/packet-cdp.c index 1ef9c995c4..3b6bd1249e 100644 --- a/epan/dissectors/packet-cdp.c +++ b/epan/dissectors/packet-cdp.c @@ -23,13 +23,10 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include <epan/to_str.h> #include <epan/in_cksum.h> -#include <epan/wmem/wmem.h> - #include <epan/oui.h> #include <epan/nlpid.h> diff --git a/epan/dissectors/packet-cell_broadcast.c b/epan/dissectors/packet-cell_broadcast.c index b4a7afaa66..485adf8f84 100644 --- a/epan/dissectors/packet-cell_broadcast.c +++ b/epan/dissectors/packet-cell_broadcast.c @@ -24,8 +24,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/asn1.h> diff --git a/epan/dissectors/packet-ceph.c b/epan/dissectors/packet-ceph.c index 7d2d536191..4b4c1b6867 100644 --- a/epan/dissectors/packet-ceph.c +++ b/epan/dissectors/packet-ceph.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include <epan/conversation.h> diff --git a/epan/dissectors/packet-cfdp.c b/epan/dissectors/packet-cfdp.c index bfa6ecb509..81bf956824 100644 --- a/epan/dissectors/packet-cfdp.c +++ b/epan/dissectors/packet-cfdp.c @@ -22,7 +22,6 @@ */ #include "config.h" -#include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-cfm.c b/epan/dissectors/packet-cfm.c index 4dd485c2d5..d237038f9e 100644 --- a/epan/dissectors/packet-cfm.c +++ b/epan/dissectors/packet-cfm.c @@ -39,7 +39,6 @@ #include "config.h" #include <epan/packet.h> -#include <glib.h> #include <epan/etypes.h> /** Value declarations for CFM EOAM (IEEE 802.1ag) dissection */ diff --git a/epan/dissectors/packet-cgmp.c b/epan/dissectors/packet-cgmp.c index 9817b145e0..b1240f4ef6 100644 --- a/epan/dissectors/packet-cgmp.c +++ b/epan/dissectors/packet-cgmp.c @@ -22,8 +22,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> /* diff --git a/epan/dissectors/packet-chargen.c b/epan/dissectors/packet-chargen.c index 91ba403d15..5fd7194531 100644 --- a/epan/dissectors/packet-chargen.c +++ b/epan/dissectors/packet-chargen.c @@ -26,11 +26,7 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <epan/wmem/wmem.h> - #define CHARGEN_PORT_UDP 19 #define CHARGEN_PORT_TCP 19 diff --git a/epan/dissectors/packet-chdlc.c b/epan/dissectors/packet-chdlc.c index 261b628484..52afc4cc64 100644 --- a/epan/dissectors/packet-chdlc.c +++ b/epan/dissectors/packet-chdlc.c @@ -22,7 +22,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <wsutil/pint.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-cigi.c b/epan/dissectors/packet-cigi.c index 674653afca..8fc621f3b6 100644 --- a/epan/dissectors/packet-cigi.c +++ b/epan/dissectors/packet-cigi.c @@ -29,12 +29,9 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> #include <epan/to_str.h> /* Forward declaration */ diff --git a/epan/dissectors/packet-cimd.c b/epan/dissectors/packet-cimd.c index 2510698de6..00bc1ba057 100644 --- a/epan/dissectors/packet-cimd.c +++ b/epan/dissectors/packet-cimd.c @@ -31,13 +31,10 @@ */ #include "config.h" -#include <glib.h> #include <stdlib.h> #include <epan/packet.h> #include <epan/to_str.h> -#include <epan/wmem/wmem.h> - #define CIMD_STX 0x02 /* Start of CIMD PDU */ #define CIMD_ETX 0x03 /* End of CIMD PDU */ #define CIMD_COLON 0x3A /* CIMD colon */ diff --git a/epan/dissectors/packet-cimetrics.c b/epan/dissectors/packet-cimetrics.c index faa278a353..80bb216f47 100644 --- a/epan/dissectors/packet-cimetrics.c +++ b/epan/dissectors/packet-cimetrics.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include "packet-llc.h" #include <epan/oui.h> diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c index ab259eaca8..0d3d373f44 100644 --- a/epan/dissectors/packet-cip.c +++ b/epan/dissectors/packet-cip.c @@ -38,11 +38,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> #include "packet-cip.h" #include "packet-enip.h" #include "packet-cipsafety.h" diff --git a/epan/dissectors/packet-cisco-erspan.c b/epan/dissectors/packet-cisco-erspan.c index cee85e757b..795c11fd91 100644 --- a/epan/dissectors/packet-cisco-erspan.c +++ b/epan/dissectors/packet-cisco-erspan.c @@ -57,7 +57,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/greproto.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-cisco-metadata.c b/epan/dissectors/packet-cisco-metadata.c index eaf0dfd351..e8b26eae7b 100644 --- a/epan/dissectors/packet-cisco-metadata.c +++ b/epan/dissectors/packet-cisco-metadata.c @@ -23,7 +23,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/etypes.h> #if 0 diff --git a/epan/dissectors/packet-cisco-sm.c b/epan/dissectors/packet-cisco-sm.c index d79e9377c9..14cf1d3cf9 100644 --- a/epan/dissectors/packet-cisco-sm.c +++ b/epan/dissectors/packet-cisco-sm.c @@ -37,8 +37,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #define MESSAGE_TYPE_START 0 diff --git a/epan/dissectors/packet-cisco-wids.c b/epan/dissectors/packet-cisco-wids.c index 854a414be7..dfbec090f7 100644 --- a/epan/dissectors/packet-cisco-wids.c +++ b/epan/dissectors/packet-cisco-wids.c @@ -45,7 +45,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-classicstun.c b/epan/dissectors/packet-classicstun.c index cd43bbc206..789ff6db96 100644 --- a/epan/dissectors/packet-classicstun.c +++ b/epan/dissectors/packet-classicstun.c @@ -26,12 +26,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> - void proto_register_classicstun(void); void proto_reg_handoff_classicstun(void); diff --git a/epan/dissectors/packet-clearcase.c b/epan/dissectors/packet-clearcase.c index 00f216e422..139aa7ed3d 100644 --- a/epan/dissectors/packet-clearcase.c +++ b/epan/dissectors/packet-clearcase.c @@ -24,7 +24,7 @@ #include "config.h" - +#include <epan/packet.h> #include "packet-rpc.h" #include "packet-clearcase.h" diff --git a/epan/dissectors/packet-clip.c b/epan/dissectors/packet-clip.c index 6b0da27d39..7c35c6f503 100644 --- a/epan/dissectors/packet-clip.c +++ b/epan/dissectors/packet-clip.c @@ -25,8 +25,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include <wiretap/wtap.h> diff --git a/epan/dissectors/packet-clique-rm.c b/epan/dissectors/packet-clique-rm.c index 7955d334fa..d743817702 100644 --- a/epan/dissectors/packet-clique-rm.c +++ b/epan/dissectors/packet-clique-rm.c @@ -24,7 +24,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> void proto_register_clique_rm(void); diff --git a/epan/dissectors/packet-clnp.c b/epan/dissectors/packet-clnp.c index 117028b595..9621549aeb 100644 --- a/epan/dissectors/packet-clnp.c +++ b/epan/dissectors/packet-clnp.c @@ -25,8 +25,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/reassemble.h> diff --git a/epan/dissectors/packet-cmpp.c b/epan/dissectors/packet-cmpp.c index c703f2b2f6..2e57e34f8d 100644 --- a/epan/dissectors/packet-cmpp.c +++ b/epan/dissectors/packet-cmpp.c @@ -24,8 +24,7 @@ #include "config.h" #include <epan/packet.h> -#include <epan/wmem/wmem.h> -#include <epan/dissectors/packet-tcp.h> +#include "packet-tcp.h" #define CMPP_FIX_HEADER_LENGTH 12 #define CMPP_DELIVER_REPORT_LEN 71 diff --git a/epan/dissectors/packet-cnip.c b/epan/dissectors/packet-cnip.c index 5f26ab2cba..27c2c10990 100644 --- a/epan/dissectors/packet-cnip.c +++ b/epan/dissectors/packet-cnip.c @@ -24,8 +24,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-coap.c b/epan/dissectors/packet-coap.c index dad39256b6..b4320ff9b1 100644 --- a/epan/dissectors/packet-coap.c +++ b/epan/dissectors/packet-coap.c @@ -32,11 +32,9 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> -#include <expert.h> +#include <epan/expert.h> void proto_register_coap(void); diff --git a/epan/dissectors/packet-collectd.c b/epan/dissectors/packet-collectd.c index abb10b7d64..f604bbb440 100644 --- a/epan/dissectors/packet-collectd.c +++ b/epan/dissectors/packet-collectd.c @@ -26,12 +26,10 @@ #include "config.h" #include <string.h> -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> #include <epan/stats_tree.h> -#include <epan/wmem/wmem.h> #include <epan/to_str.h> #define STR_NONNULL(str) ((str) ? (str) : "(null)") diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c index 4c20702457..3d3b68c1d8 100644 --- a/epan/dissectors/packet-cops.c +++ b/epan/dissectors/packet-cops.c @@ -56,12 +56,8 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> -#include <epan/emem.h> #include "packet-tcp.h" #include <epan/oids.h> diff --git a/epan/dissectors/packet-cosine.c b/epan/dissectors/packet-cosine.c index c4ac985e21..8f8b587cbb 100644 --- a/epan/dissectors/packet-cosine.c +++ b/epan/dissectors/packet-cosine.c @@ -29,8 +29,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <wiretap/wtap.h> diff --git a/epan/dissectors/packet-couchbase.c b/epan/dissectors/packet-couchbase.c index 3b468e65f0..5a386480aa 100644 --- a/epan/dissectors/packet-couchbase.c +++ b/epan/dissectors/packet-couchbase.c @@ -40,8 +40,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-cp2179.c b/epan/dissectors/packet-cp2179.c index 66a67bf2b4..e114199cf7 100644 --- a/epan/dissectors/packet-cp2179.c +++ b/epan/dissectors/packet-cp2179.c @@ -56,8 +56,6 @@ F = 16-bit CRC #include "packet-rtacser.h" #include <epan/to_str.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> - #include <epan/prefs.h> #include <epan/reassemble.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-cpfi.c b/epan/dissectors/packet-cpfi.c index 9099beb9ae..81b46d78db 100644 --- a/epan/dissectors/packet-cpfi.c +++ b/epan/dissectors/packet-cpfi.c @@ -29,8 +29,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include "packet-fc.h" diff --git a/epan/dissectors/packet-cpha.c b/epan/dissectors/packet-cpha.c index c72973f39c..cbe2e17304 100644 --- a/epan/dissectors/packet-cpha.c +++ b/epan/dissectors/packet-cpha.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/ipproto.h> diff --git a/epan/dissectors/packet-csm-encaps.c b/epan/dissectors/packet-csm-encaps.c index c6af938b4c..9e2b0433d9 100644 --- a/epan/dissectors/packet-csm-encaps.c +++ b/epan/dissectors/packet-csm-encaps.c @@ -25,11 +25,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/tap.h> -#include <epan/wmem/wmem.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-csn1.c b/epan/dissectors/packet-csn1.c index b7b58b620e..23745ad7fc 100644 --- a/epan/dissectors/packet-csn1.c +++ b/epan/dissectors/packet-csn1.c @@ -25,7 +25,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/to_str.h> #include "packet-csn1.h" diff --git a/epan/dissectors/packet-ctdb.c b/epan/dissectors/packet-ctdb.c index b6cac4ec7b..acccfd436c 100644 --- a/epan/dissectors/packet-ctdb.c +++ b/epan/dissectors/packet-ctdb.c @@ -23,13 +23,9 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> - void proto_register_ctdb(void); void proto_reg_handoff_ctdb(void); diff --git a/epan/dissectors/packet-cups.c b/epan/dissectors/packet-cups.c index 5ad008e4d1..1414548fbf 100644 --- a/epan/dissectors/packet-cups.c +++ b/epan/dissectors/packet-cups.c @@ -23,9 +23,8 @@ #include "config.h" -#include <glib.h> -#include <wsutil/str_util.h> #include <epan/packet.h> +#include <wsutil/str_util.h> /**********************************************************************/ diff --git a/epan/dissectors/packet-daap.c b/epan/dissectors/packet-daap.c index 79f4d3b97c..28870d06d5 100644 --- a/epan/dissectors/packet-daap.c +++ b/epan/dissectors/packet-daap.c @@ -23,10 +23,9 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/exceptions.h> -#include <epan/dissectors/packet-http.h> +#include "packet-http.h" #define TCP_PORT_DAAP 3689 diff --git a/epan/dissectors/packet-data.c b/epan/dissectors/packet-data.c index a6eaf9801f..3dc21aac19 100644 --- a/epan/dissectors/packet-data.c +++ b/epan/dissectors/packet-data.c @@ -25,13 +25,10 @@ #include "config.h" -#include <glib.h> - -#include <wsutil/md5.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/to_str.h> +#include <wsutil/md5.h> #include "packet-data.h" /* proto_data cannot be static because it's referenced in the diff --git a/epan/dissectors/packet-db-lsp.c b/epan/dissectors/packet-db-lsp.c index 58702fa0db..b0fb2a17dd 100644 --- a/epan/dissectors/packet-db-lsp.c +++ b/epan/dissectors/packet-db-lsp.c @@ -24,8 +24,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/asn1.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-dbus.c b/epan/dissectors/packet-dbus.c index 85938624bd..9201b46f48 100644 --- a/epan/dissectors/packet-dbus.c +++ b/epan/dissectors/packet-dbus.c @@ -30,7 +30,7 @@ #include <epan/packet.h> #include <wiretap/wtap.h> #include <epan/expert.h> -#include <epan/dissectors/packet-tcp.h> +#include "packet-tcp.h" void proto_register_dbus(void); void proto_reg_handoff_dbus(void); diff --git a/epan/dissectors/packet-dcc.c b/epan/dissectors/packet-dcc.c index 2b822a978e..673a2d73d0 100644 --- a/epan/dissectors/packet-dcc.c +++ b/epan/dissectors/packet-dcc.c @@ -27,11 +27,10 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> -#include <packet-dcc.h> +#include "packet-dcc.h" void proto_register_dcc(void); void proto_reg_handoff_dcc(void); diff --git a/epan/dissectors/packet-dccp.c b/epan/dissectors/packet-dccp.c index 40565911ab..707851fae2 100644 --- a/epan/dissectors/packet-dccp.c +++ b/epan/dissectors/packet-dccp.c @@ -48,15 +48,12 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/addr_resolv.h> #include <epan/ipproto.h> #include <epan/in_cksum.h> #include <epan/prefs.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> #include "packet-ip.h" #include <epan/conversation.h> #include <epan/tap.h> diff --git a/epan/dissectors/packet-dcerpc-bossvr.c b/epan/dissectors/packet-dcerpc-bossvr.c index 8d78996bf8..9ffc0ee18e 100644 --- a/epan/dissectors/packet-dcerpc-bossvr.c +++ b/epan/dissectors/packet-dcerpc-bossvr.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-dcerpc-browser.c b/epan/dissectors/packet-dcerpc-browser.c index 14fcc3fb7f..cc05113d4d 100644 --- a/epan/dissectors/packet-dcerpc-browser.c +++ b/epan/dissectors/packet-dcerpc-browser.c @@ -27,8 +27,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> diff --git a/epan/dissectors/packet-dcerpc-cds_clerkserver.c b/epan/dissectors/packet-dcerpc-cds_clerkserver.c index 40e2fa0b94..48792a9e38 100644 --- a/epan/dissectors/packet-dcerpc-cds_clerkserver.c +++ b/epan/dissectors/packet-dcerpc-cds_clerkserver.c @@ -28,7 +28,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-dcerpc-cds_solicit.c b/epan/dissectors/packet-dcerpc-cds_solicit.c index 78d2483591..45e7255a65 100644 --- a/epan/dissectors/packet-dcerpc-cds_solicit.c +++ b/epan/dissectors/packet-dcerpc-cds_solicit.c @@ -26,7 +26,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-dcerpc-conv.c b/epan/dissectors/packet-dcerpc-conv.c index 5a300486eb..bb206b2df3 100644 --- a/epan/dissectors/packet-dcerpc-conv.c +++ b/epan/dissectors/packet-dcerpc-conv.c @@ -24,7 +24,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" #include "packet-dcerpc-dce122.h" diff --git a/epan/dissectors/packet-dcerpc-cprpc_server.c b/epan/dissectors/packet-dcerpc-cprpc_server.c index 6df11e00e5..94b45a0403 100644 --- a/epan/dissectors/packet-dcerpc-cprpc_server.c +++ b/epan/dissectors/packet-dcerpc-cprpc_server.c @@ -26,7 +26,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-dcerpc-dtsprovider.c b/epan/dissectors/packet-dcerpc-dtsprovider.c index ffc1056e7d..116fcacf04 100644 --- a/epan/dissectors/packet-dcerpc-dtsprovider.c +++ b/epan/dissectors/packet-dcerpc-dtsprovider.c @@ -26,7 +26,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" #include "packet-dcerpc-dce122.h" diff --git a/epan/dissectors/packet-dcerpc-dtsstime_req.c b/epan/dissectors/packet-dcerpc-dtsstime_req.c index 758636d95b..2f21aff3ca 100644 --- a/epan/dissectors/packet-dcerpc-dtsstime_req.c +++ b/epan/dissectors/packet-dcerpc-dtsstime_req.c @@ -26,7 +26,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-dcerpc-epm.c b/epan/dissectors/packet-dcerpc-epm.c index e9c3ecb981..c33841f53a 100644 --- a/epan/dissectors/packet-dcerpc-epm.c +++ b/epan/dissectors/packet-dcerpc-epm.c @@ -23,7 +23,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/to_str.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-dcerpc-fileexp.c b/epan/dissectors/packet-dcerpc-fileexp.c index 4e7a21b78a..e045b508a9 100644 --- a/epan/dissectors/packet-dcerpc-fileexp.c +++ b/epan/dissectors/packet-dcerpc-fileexp.c @@ -26,8 +26,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> diff --git a/epan/dissectors/packet-dcerpc-fldb.c b/epan/dissectors/packet-dcerpc-fldb.c index d4c1244f54..ecc9296f86 100644 --- a/epan/dissectors/packet-dcerpc-fldb.c +++ b/epan/dissectors/packet-dcerpc-fldb.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" #include "packet-dcerpc-dce122.h" diff --git a/epan/dissectors/packet-dcerpc-frsapi.c b/epan/dissectors/packet-dcerpc-frsapi.c index 9281327031..649a1345c9 100644 --- a/epan/dissectors/packet-dcerpc-frsapi.c +++ b/epan/dissectors/packet-dcerpc-frsapi.c @@ -24,7 +24,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" #include "packet-dcerpc-frsapi.h" diff --git a/epan/dissectors/packet-dcerpc-ftserver.c b/epan/dissectors/packet-dcerpc-ftserver.c index 3f18a588c5..5862816e28 100644 --- a/epan/dissectors/packet-dcerpc-ftserver.c +++ b/epan/dissectors/packet-dcerpc-ftserver.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-dcerpc-icl_rpc.c b/epan/dissectors/packet-dcerpc-icl_rpc.c index 0f5147206a..4857282e95 100644 --- a/epan/dissectors/packet-dcerpc-icl_rpc.c +++ b/epan/dissectors/packet-dcerpc-icl_rpc.c @@ -26,7 +26,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-dcerpc-krb5rpc.c b/epan/dissectors/packet-dcerpc-krb5rpc.c index 1f64a807b0..0919c22773 100644 --- a/epan/dissectors/packet-dcerpc-krb5rpc.c +++ b/epan/dissectors/packet-dcerpc-krb5rpc.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/asn1.h> #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-dcerpc-llb.c b/epan/dissectors/packet-dcerpc-llb.c index b0e49079df..4fd1e7d09e 100644 --- a/epan/dissectors/packet-dcerpc-llb.c +++ b/epan/dissectors/packet-dcerpc-llb.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" #include "packet-dcerpc-dce122.h" diff --git a/epan/dissectors/packet-dcerpc-messenger.c b/epan/dissectors/packet-dcerpc-messenger.c index b7ece7523d..64d6506e81 100644 --- a/epan/dissectors/packet-dcerpc-messenger.c +++ b/epan/dissectors/packet-dcerpc-messenger.c @@ -23,7 +23,7 @@ #include "config.h" -#include <glib.h> +#include <epan/packet.h> #include "packet-dcerpc.h" #include "packet-dcerpc-nt.h" #include "packet-windows-common.h" diff --git a/epan/dissectors/packet-dcerpc-mgmt.c b/epan/dissectors/packet-dcerpc-mgmt.c index 792059fd33..4dcac7dbc6 100644 --- a/epan/dissectors/packet-dcerpc-mgmt.c +++ b/epan/dissectors/packet-dcerpc-mgmt.c @@ -24,7 +24,6 @@ #include "config.h" #include <stdio.h> -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" #include "packet-dcerpc-nt.h" diff --git a/epan/dissectors/packet-dcerpc-ndr.c b/epan/dissectors/packet-dcerpc-ndr.c index ec8cdfc4a9..6f6645fdb5 100644 --- a/epan/dissectors/packet-dcerpc-ndr.c +++ b/epan/dissectors/packet-dcerpc-ndr.c @@ -23,10 +23,7 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c index c3102cde65..58d57d1ba1 100644 --- a/epan/dissectors/packet-dcerpc-netlogon.c +++ b/epan/dissectors/packet-dcerpc-netlogon.c @@ -24,17 +24,14 @@ #include "config.h" - -#include <glib.h> #include <string.h> +#include <epan/packet.h> #include <wsutil/rc4.h> #include <wsutil/md4.h> #include <wsutil/md5.h> #include <wsutil/des.h> -#include <epan/packet.h> -#include <epan/wmem/wmem.h> /* for dissect_mscldap_string */ #include "packet-ldap.h" #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-dcerpc-nt.c b/epan/dissectors/packet-dcerpc-nt.c index 2502d5e860..5d952ede06 100644 --- a/epan/dissectors/packet-dcerpc-nt.c +++ b/epan/dissectors/packet-dcerpc-nt.c @@ -29,9 +29,7 @@ #include <string.h> -#include <glib.h> #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include <epan/expert.h> #include "packet-dcerpc.h" #include "packet-dcerpc-nt.h" diff --git a/epan/dissectors/packet-dcerpc-pnp.c b/epan/dissectors/packet-dcerpc-pnp.c index 37d73622e8..6e7f276bad 100644 --- a/epan/dissectors/packet-dcerpc-pnp.c +++ b/epan/dissectors/packet-dcerpc-pnp.c @@ -24,7 +24,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" #include "packet-dcerpc-pnp.h" diff --git a/epan/dissectors/packet-dcerpc-rdaclif.c b/epan/dissectors/packet-dcerpc-rdaclif.c index d91c0ece8b..fcd7eed228 100644 --- a/epan/dissectors/packet-dcerpc-rdaclif.c +++ b/epan/dissectors/packet-dcerpc-rdaclif.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-dcerpc-rep_proc.c b/epan/dissectors/packet-dcerpc-rep_proc.c index 00228da27b..87671f0795 100644 --- a/epan/dissectors/packet-dcerpc-rep_proc.c +++ b/epan/dissectors/packet-dcerpc-rep_proc.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-dcerpc-roverride.c b/epan/dissectors/packet-dcerpc-roverride.c index 051e488875..e14bb6ff7a 100644 --- a/epan/dissectors/packet-dcerpc-roverride.c +++ b/epan/dissectors/packet-dcerpc-roverride.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-dcerpc-rpriv.c b/epan/dissectors/packet-dcerpc-rpriv.c index 646544c9f3..7bad7ec452 100644 --- a/epan/dissectors/packet-dcerpc-rpriv.c +++ b/epan/dissectors/packet-dcerpc-rpriv.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-dcerpc-rras.c b/epan/dissectors/packet-dcerpc-rras.c index f1066c8fa5..d0e1638d97 100644 --- a/epan/dissectors/packet-dcerpc-rras.c +++ b/epan/dissectors/packet-dcerpc-rras.c @@ -24,7 +24,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" #include "packet-dcerpc-rras.h" diff --git a/epan/dissectors/packet-dcerpc-rs_acct.c b/epan/dissectors/packet-dcerpc-rs_acct.c index 1693ee0c7b..bc241836d4 100644 --- a/epan/dissectors/packet-dcerpc-rs_acct.c +++ b/epan/dissectors/packet-dcerpc-rs_acct.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-dcerpc-rs_attr.c b/epan/dissectors/packet-dcerpc-rs_attr.c index 65f363432f..379a2a6096 100644 --- a/epan/dissectors/packet-dcerpc-rs_attr.c +++ b/epan/dissectors/packet-dcerpc-rs_attr.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-dcerpc-rs_attr_schema.c b/epan/dissectors/packet-dcerpc-rs_attr_schema.c index 9594cd483d..fc268a8a7d 100644 --- a/epan/dissectors/packet-dcerpc-rs_attr_schema.c +++ b/epan/dissectors/packet-dcerpc-rs_attr_schema.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-dcerpc-rs_bind.c b/epan/dissectors/packet-dcerpc-rs_bind.c index ef7b58436e..24e3dee386 100644 --- a/epan/dissectors/packet-dcerpc-rs_bind.c +++ b/epan/dissectors/packet-dcerpc-rs_bind.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" #include "packet-dcerpc-dce122.h" diff --git a/epan/dissectors/packet-dcerpc-rs_misc.c b/epan/dissectors/packet-dcerpc-rs_misc.c index bdcb592101..7490013868 100644 --- a/epan/dissectors/packet-dcerpc-rs_misc.c +++ b/epan/dissectors/packet-dcerpc-rs_misc.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-dcerpc-rs_pgo.c b/epan/dissectors/packet-dcerpc-rs_pgo.c index ba8e091210..63692afd8a 100644 --- a/epan/dissectors/packet-dcerpc-rs_pgo.c +++ b/epan/dissectors/packet-dcerpc-rs_pgo.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" #include "packet-dcerpc-dce122.h" diff --git a/epan/dissectors/packet-dcerpc-rs_plcy.c b/epan/dissectors/packet-dcerpc-rs_plcy.c index daf072adb9..0e0dcdfd8c 100644 --- a/epan/dissectors/packet-dcerpc-rs_plcy.c +++ b/epan/dissectors/packet-dcerpc-rs_plcy.c @@ -26,7 +26,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-dcerpc-rs_prop_acct.c b/epan/dissectors/packet-dcerpc-rs_prop_acct.c index 43641daf05..57f60a9aa0 100644 --- a/epan/dissectors/packet-dcerpc-rs_prop_acct.c +++ b/epan/dissectors/packet-dcerpc-rs_prop_acct.c @@ -26,7 +26,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-dcerpc-rs_prop_acl.c b/epan/dissectors/packet-dcerpc-rs_prop_acl.c index 87255ffce6..da50bcab73 100644 --- a/epan/dissectors/packet-dcerpc-rs_prop_acl.c +++ b/epan/dissectors/packet-dcerpc-rs_prop_acl.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-dcerpc-rs_prop_attr.c b/epan/dissectors/packet-dcerpc-rs_prop_attr.c index 59d91f8ce6..0b5b1f05e3 100644 --- a/epan/dissectors/packet-dcerpc-rs_prop_attr.c +++ b/epan/dissectors/packet-dcerpc-rs_prop_attr.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-dcerpc-rs_prop_pgo.c b/epan/dissectors/packet-dcerpc-rs_prop_pgo.c index ba89d23692..e0a4201e73 100644 --- a/epan/dissectors/packet-dcerpc-rs_prop_pgo.c +++ b/epan/dissectors/packet-dcerpc-rs_prop_pgo.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-dcerpc-rs_prop_plcy.c b/epan/dissectors/packet-dcerpc-rs_prop_plcy.c index 95dd85ce28..a992295b99 100644 --- a/epan/dissectors/packet-dcerpc-rs_prop_plcy.c +++ b/epan/dissectors/packet-dcerpc-rs_prop_plcy.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c b/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c index 27d380a0cd..a520335e44 100644 --- a/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c +++ b/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-dcerpc-rs_repadm.c b/epan/dissectors/packet-dcerpc-rs_repadm.c index f0904c9782..1bbb11c3f9 100644 --- a/epan/dissectors/packet-dcerpc-rs_repadm.c +++ b/epan/dissectors/packet-dcerpc-rs_repadm.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-dcerpc-rs_replist.c b/epan/dissectors/packet-dcerpc-rs_replist.c index 85dde52516..2d88098832 100644 --- a/epan/dissectors/packet-dcerpc-rs_replist.c +++ b/epan/dissectors/packet-dcerpc-rs_replist.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-dcerpc-rs_repmgr.c b/epan/dissectors/packet-dcerpc-rs_repmgr.c index 1fb386cdf9..100ccc259e 100644 --- a/epan/dissectors/packet-dcerpc-rs_repmgr.c +++ b/epan/dissectors/packet-dcerpc-rs_repmgr.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-dcerpc-rs_unix.c b/epan/dissectors/packet-dcerpc-rs_unix.c index 0cba6f1ebe..7378445e70 100644 --- a/epan/dissectors/packet-dcerpc-rs_unix.c +++ b/epan/dissectors/packet-dcerpc-rs_unix.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-dcerpc-rsec_login.c b/epan/dissectors/packet-dcerpc-rsec_login.c index 20db8b1af1..68c7d99090 100644 --- a/epan/dissectors/packet-dcerpc-rsec_login.c +++ b/epan/dissectors/packet-dcerpc-rsec_login.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-dcerpc-secidmap.c b/epan/dissectors/packet-dcerpc-secidmap.c index 804c882097..23fe3176fb 100644 --- a/epan/dissectors/packet-dcerpc-secidmap.c +++ b/epan/dissectors/packet-dcerpc-secidmap.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-dcerpc-spoolss.c b/epan/dissectors/packet-dcerpc-spoolss.c index 1345c4c688..7155a5eb10 100644 --- a/epan/dissectors/packet-dcerpc-spoolss.c +++ b/epan/dissectors/packet-dcerpc-spoolss.c @@ -29,11 +29,9 @@ #include "config.h" -#include <glib.h> #include <string.h> #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include "packet-dcerpc.h" #include "packet-dcerpc-nt.h" #include "packet-dcerpc-spoolss.h" diff --git a/epan/dissectors/packet-dcerpc-svcctl.c b/epan/dissectors/packet-dcerpc-svcctl.c index 75b0cf88ef..005e51d47d 100644 --- a/epan/dissectors/packet-dcerpc-svcctl.c +++ b/epan/dissectors/packet-dcerpc-svcctl.c @@ -25,9 +25,7 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include "packet-dcerpc.h" #include "packet-dcerpc-svcctl.h" #include "packet-dcerpc-nt.h" diff --git a/epan/dissectors/packet-dcerpc-tapi.c b/epan/dissectors/packet-dcerpc-tapi.c index b7dc18fb96..0f00bd98c8 100644 --- a/epan/dissectors/packet-dcerpc-tapi.c +++ b/epan/dissectors/packet-dcerpc-tapi.c @@ -26,7 +26,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" #include "packet-dcerpc-nt.h" diff --git a/epan/dissectors/packet-dcerpc-tkn4int.c b/epan/dissectors/packet-dcerpc-tkn4int.c index ddeceeb108..7e08da71ff 100644 --- a/epan/dissectors/packet-dcerpc-tkn4int.c +++ b/epan/dissectors/packet-dcerpc-tkn4int.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-dcerpc-trksvr.c b/epan/dissectors/packet-dcerpc-trksvr.c index 388b686e74..0658854c09 100644 --- a/epan/dissectors/packet-dcerpc-trksvr.c +++ b/epan/dissectors/packet-dcerpc-trksvr.c @@ -26,7 +26,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" #include "packet-dcerpc-nt.h" diff --git a/epan/dissectors/packet-dcerpc-ubikdisk.c b/epan/dissectors/packet-dcerpc-ubikdisk.c index d44a29bf08..2fc47faa22 100644 --- a/epan/dissectors/packet-dcerpc-ubikdisk.c +++ b/epan/dissectors/packet-dcerpc-ubikdisk.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-dcerpc-ubikvote.c b/epan/dissectors/packet-dcerpc-ubikvote.c index bfd346b12c..4de3e13e60 100644 --- a/epan/dissectors/packet-dcerpc-ubikvote.c +++ b/epan/dissectors/packet-dcerpc-ubikvote.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-dcerpc-update.c b/epan/dissectors/packet-dcerpc-update.c index f3afee9c23..7a95ebd921 100644 --- a/epan/dissectors/packet-dcerpc-update.c +++ b/epan/dissectors/packet-dcerpc-update.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" #include "packet-dcerpc-dce122.h" diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index c602dceb9b..c98421019b 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -31,23 +31,20 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/conversation.h> #include <epan/prefs.h> #include <epan/reassemble.h> #include <epan/tap.h> -#include <epan/wmem/wmem.h> #include <epan/expert.h> #include <epan/strutil.h> #include <epan/addr_resolv.h> #include <epan/show_exception.h> #include <epan/decode_as.h> -#include <epan/dissectors/packet-tcp.h> -#include <epan/dissectors/packet-dcerpc.h> -#include <epan/dissectors/packet-dcerpc-nt.h> +#include "packet-tcp.h" +#include "packet-dcerpc.h" +#include "packet-dcerpc-nt.h" void proto_register_dcerpc(void); void proto_reg_handoff_dcerpc(void); diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c index c09d16991c..d0cf8a0b30 100644 --- a/epan/dissectors/packet-dcm.c +++ b/epan/dissectors/packet-dcm.c @@ -212,12 +212,9 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> #include <epan/strutil.h> #include <epan/conversation.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-dcom-dispatch.c b/epan/dissectors/packet-dcom-dispatch.c index 911a4d81e6..c8beb198d4 100644 --- a/epan/dissectors/packet-dcom-dispatch.c +++ b/epan/dissectors/packet-dcom-dispatch.c @@ -25,7 +25,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" #include "packet-dcom.h" diff --git a/epan/dissectors/packet-dcom-oxid.c b/epan/dissectors/packet-dcom-oxid.c index b35e49c643..ceb943acd7 100644 --- a/epan/dissectors/packet-dcom-oxid.c +++ b/epan/dissectors/packet-dcom-oxid.c @@ -25,7 +25,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" #include "packet-dcom.h" diff --git a/epan/dissectors/packet-dcom-remact.c b/epan/dissectors/packet-dcom-remact.c index 12e7bb2262..d546d4b582 100644 --- a/epan/dissectors/packet-dcom-remact.c +++ b/epan/dissectors/packet-dcom-remact.c @@ -25,7 +25,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-dcerpc.h" #include "packet-dcom.h" diff --git a/epan/dissectors/packet-dcom-remunkn.c b/epan/dissectors/packet-dcom-remunkn.c index 019dc910c7..2545905475 100644 --- a/epan/dissectors/packet-dcom-remunkn.c +++ b/epan/dissectors/packet-dcom-remunkn.c @@ -25,9 +25,7 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include "packet-dcerpc.h" #include "packet-dcom.h" #include "guid-utils.h" diff --git a/epan/dissectors/packet-dcom-sysact.c b/epan/dissectors/packet-dcom-sysact.c index 57ab6512d8..444908d875 100644 --- a/epan/dissectors/packet-dcom-sysact.c +++ b/epan/dissectors/packet-dcom-sysact.c @@ -24,9 +24,7 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include "packet-dcerpc.h" #include "packet-dcom.h" diff --git a/epan/dissectors/packet-dcom.c b/epan/dissectors/packet-dcom.c index 836801f6b2..45e9187738 100644 --- a/epan/dissectors/packet-dcom.c +++ b/epan/dissectors/packet-dcom.c @@ -75,11 +75,8 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> -#include <epan/wmem/wmem.h> #include <epan/addr_resolv.h> #ifndef HAVE_INET_ATON #include <wsutil/inet_aton.h> diff --git a/epan/dissectors/packet-dcp-etsi.c b/epan/dissectors/packet-dcp-etsi.c index f25ec8c5e6..1e25e0c2b6 100644 --- a/epan/dissectors/packet-dcp-etsi.c +++ b/epan/dissectors/packet-dcp-etsi.c @@ -26,13 +26,13 @@ #include "config.h" +#include <string.h> + #include <epan/packet.h> #include <epan/expert.h> #include <epan/reassemble.h> #include <epan/crc16-tvb.h> #include <epan/reedsolomon.h> -#include <epan/wmem/wmem.h> -#include <string.h> /* forward reference */ void proto_register_dcp_etsi(void); diff --git a/epan/dissectors/packet-ddtp.c b/epan/dissectors/packet-ddtp.c index 66f746826d..b419bb3f73 100644 --- a/epan/dissectors/packet-ddtp.c +++ b/epan/dissectors/packet-ddtp.c @@ -24,7 +24,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-dec-bpdu.c b/epan/dissectors/packet-dec-bpdu.c index 276d328ca5..9de995564b 100644 --- a/epan/dissectors/packet-dec-bpdu.c +++ b/epan/dissectors/packet-dec-bpdu.c @@ -24,7 +24,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/addr_resolv.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-dec-dnart.c b/epan/dissectors/packet-dec-dnart.c index 464f1cc7d3..7488b4ee4f 100644 --- a/epan/dissectors/packet-dec-dnart.c +++ b/epan/dissectors/packet-dec-dnart.c @@ -47,9 +47,7 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include <epan/etypes.h> #include <epan/ppptypes.h> diff --git a/epan/dissectors/packet-dect.c b/epan/dissectors/packet-dect.c index 0a61d5f90b..0dff655754 100644 --- a/epan/dissectors/packet-dect.c +++ b/epan/dissectors/packet-dect.c @@ -38,12 +38,8 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/etypes.h> -#include <epan/wmem/wmem.h> - #define ETHERTYPE_DECT 0x2323 #define DECT_PACKET_INFO_LEN 11 diff --git a/epan/dissectors/packet-devicenet.c b/epan/dissectors/packet-devicenet.c index 430ea3cb99..c39c04943d 100644 --- a/epan/dissectors/packet-devicenet.c +++ b/epan/dissectors/packet-devicenet.c @@ -26,8 +26,6 @@ */ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/uat.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-dhcp-failover.c b/epan/dissectors/packet-dhcp-failover.c index 65bfae5a37..f9b60b5f25 100644 --- a/epan/dissectors/packet-dhcp-failover.c +++ b/epan/dissectors/packet-dhcp-failover.c @@ -35,8 +35,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/strutil.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c index 3e9e0ef312..27b832afa0 100644 --- a/epan/dissectors/packet-dhcpv6.c +++ b/epan/dissectors/packet-dhcpv6.c @@ -52,7 +52,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/sminmpec.h> #include <epan/strutil.h> @@ -60,7 +59,6 @@ #include <epan/expert.h> #include <epan/prefs.h> #include <epan/to_str.h> -#include <epan/wmem/wmem.h> #include "packet-tcp.h" #include "packet-arp.h" diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c index 6f91180216..e93e73dcd6 100644 --- a/epan/dissectors/packet-diameter.c +++ b/epan/dissectors/packet-diameter.c @@ -45,14 +45,11 @@ #include <string.h> #include <errno.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <wsutil/filesystem.h> #include <epan/prefs.h> #include <epan/sminmpec.h> -#include <epan/wmem/wmem.h> #include <epan/expert.h> #include <epan/conversation.h> #include <epan/tap.h> diff --git a/epan/dissectors/packet-diameter_3gpp.c b/epan/dissectors/packet-diameter_3gpp.c index 3f7d0a9283..4ff934fc41 100644 --- a/epan/dissectors/packet-diameter_3gpp.c +++ b/epan/dissectors/packet-diameter_3gpp.c @@ -28,8 +28,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/asn1.h> diff --git a/epan/dissectors/packet-diffserv-mpls-common.c b/epan/dissectors/packet-diffserv-mpls-common.c index 599473f7f7..16af9d7ff1 100644 --- a/epan/dissectors/packet-diffserv-mpls-common.c +++ b/epan/dissectors/packet-diffserv-mpls-common.c @@ -30,7 +30,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-diffserv-mpls-common.h" diff --git a/epan/dissectors/packet-distcc.c b/epan/dissectors/packet-distcc.c index 00987a7072..25155205d7 100644 --- a/epan/dissectors/packet-distcc.c +++ b/epan/dissectors/packet-distcc.c @@ -29,8 +29,6 @@ #include <string.h> #include <time.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-dlm3.c b/epan/dissectors/packet-dlm3.c index adb08db421..4d435e0b7d 100644 --- a/epan/dissectors/packet-dlm3.c +++ b/epan/dissectors/packet-dlm3.c @@ -45,8 +45,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-dlsw.c b/epan/dissectors/packet-dlsw.c index 135560823f..5416904443 100644 --- a/epan/dissectors/packet-dlsw.c +++ b/epan/dissectors/packet-dlsw.c @@ -25,8 +25,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c index 981b97852b..5692376f97 100644 --- a/epan/dissectors/packet-dmp.c +++ b/epan/dissectors/packet-dmp.c @@ -44,7 +44,6 @@ #include <epan/addr_resolv.h> #include <epan/to_str.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> #include <epan/expert.h> #include <epan/crc16-tvb.h> #include <epan/asn1.h> diff --git a/epan/dissectors/packet-dmx-chan.c b/epan/dissectors/packet-dmx-chan.c index fe39a5b87b..dab05239c9 100644 --- a/epan/dissectors/packet-dmx-chan.c +++ b/epan/dissectors/packet-dmx-chan.c @@ -37,7 +37,6 @@ #include "config.h" #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include <epan/prefs.h> void proto_register_dmx_chan(void); diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c index d0717b8fa5..d7e1573d46 100644 --- a/epan/dissectors/packet-dnp.c +++ b/epan/dissectors/packet-dnp.c @@ -32,12 +32,9 @@ #include <string.h> #include <math.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/reassemble.h> -#include <epan/wmem/wmem.h> #include "packet-tcp.h" #include "packet-rtacser.h" #include <epan/conversation.h> diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c index 93939b10b1..df921aae2f 100644 --- a/epan/dissectors/packet-dns.c +++ b/epan/dissectors/packet-dns.c @@ -34,11 +34,9 @@ #include <string.h> #include <memory.h> -#include <glib.h> #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> #include <epan/ipproto.h> #include <epan/addr_resolv.h> #include "packet-dns.h" diff --git a/epan/dissectors/packet-dplay.c b/epan/dissectors/packet-dplay.c index 11df65c128..c95acd9589 100644 --- a/epan/dissectors/packet-dplay.c +++ b/epan/dissectors/packet-dplay.c @@ -25,10 +25,10 @@ #include "config.h" +#include <string.h> + #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include <epan/aftypes.h> -#include <string.h> /* function declarations */ void proto_register_dplay(void); diff --git a/epan/dissectors/packet-dpnss-link.c b/epan/dissectors/packet-dpnss-link.c index 55746d4885..caa20d4682 100644 --- a/epan/dissectors/packet-dpnss-link.c +++ b/epan/dissectors/packet-dpnss-link.c @@ -27,8 +27,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <wiretap/wtap.h> diff --git a/epan/dissectors/packet-dpnss.c b/epan/dissectors/packet-dpnss.c index 8fa810190e..0a504d01ab 100644 --- a/epan/dissectors/packet-dpnss.c +++ b/epan/dissectors/packet-dpnss.c @@ -31,8 +31,6 @@ #include <stdlib.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-drda.c b/epan/dissectors/packet-drda.c index b0dedae4fe..1b5141c749 100644 --- a/epan/dissectors/packet-drda.c +++ b/epan/dissectors/packet-drda.c @@ -47,7 +47,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/conversation.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-dsi.c b/epan/dissectors/packet-dsi.c index 6ea133452b..c8de77c863 100644 --- a/epan/dissectors/packet-dsi.c +++ b/epan/dissectors/packet-dsi.c @@ -25,8 +25,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-dsr.c b/epan/dissectors/packet-dsr.c index f59461f81b..6502f75812 100755 --- a/epan/dissectors/packet-dsr.c +++ b/epan/dissectors/packet-dsr.c @@ -25,8 +25,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/ipproto.h> #include <epan/addr_resolv.h> diff --git a/epan/dissectors/packet-dtcp-ip.c b/epan/dissectors/packet-dtcp-ip.c index 178a9d3e37..497caace16 100644 --- a/epan/dissectors/packet-dtcp-ip.c +++ b/epan/dissectors/packet-dtcp-ip.c @@ -40,7 +40,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c index d738ecda9a..14dd037055 100644 --- a/epan/dissectors/packet-dtls.c +++ b/epan/dissectors/packet-dtls.c @@ -48,23 +48,20 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/conversation.h> #include <epan/expert.h> #include <epan/prefs.h> #include <epan/to_str.h> #include <epan/asn1.h> -#include <epan/dissectors/packet-x509af.h> -#include <epan/wmem/wmem.h> #include <epan/tap.h> #include <epan/reassemble.h> -#include "packet-ssl-utils.h" -#include <wsutil/file_util.h> #include <epan/uat.h> #include <epan/sctpppids.h> #include <epan/exported_pdu.h> +#include <wsutil/file_util.h> +#include "packet-x509af.h" +#include "packet-ssl-utils.h" void proto_register_dtls(void); diff --git a/epan/dissectors/packet-dtn.c b/epan/dissectors/packet-dtn.c index e654fca88e..941abe0baf 100644 --- a/epan/dissectors/packet-dtn.c +++ b/epan/dissectors/packet-dtn.c @@ -34,13 +34,10 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/reassemble.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> #include "packet-dtn.h" #include "packet-tcp.h" diff --git a/epan/dissectors/packet-dtp.c b/epan/dissectors/packet-dtp.c index d51b1f8e15..f8b230cdba 100644 --- a/epan/dissectors/packet-dtp.c +++ b/epan/dissectors/packet-dtp.c @@ -33,8 +33,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/to_str.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-dtpt.c b/epan/dissectors/packet-dtpt.c index eb4171b3ba..2e88228cf5 100644 --- a/epan/dissectors/packet-dtpt.c +++ b/epan/dissectors/packet-dtpt.c @@ -30,7 +30,6 @@ #include <string.h> -#include <glib.h> #include <epan/packet.h> #include <epan/conversation.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-dvb-ait.c b/epan/dissectors/packet-dvb-ait.c index f0f041e79d..35508014e0 100644 --- a/epan/dissectors/packet-dvb-ait.c +++ b/epan/dissectors/packet-dvb-ait.c @@ -26,7 +26,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-mpeg-sect.h" diff --git a/epan/dissectors/packet-dvb-bat.c b/epan/dissectors/packet-dvb-bat.c index 4dd351b1f6..d2ec37ab78 100644 --- a/epan/dissectors/packet-dvb-bat.c +++ b/epan/dissectors/packet-dvb-bat.c @@ -23,11 +23,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <epan/dissectors/packet-mpeg-sect.h> - +#include "packet-mpeg-sect.h" #include "packet-mpeg-descriptor.h" void proto_register_dvb_bat(void); diff --git a/epan/dissectors/packet-dvb-data-mpe.c b/epan/dissectors/packet-dvb-data-mpe.c index 830987eb53..c15cfc3f40 100644 --- a/epan/dissectors/packet-dvb-data-mpe.c +++ b/epan/dissectors/packet-dvb-data-mpe.c @@ -23,11 +23,9 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/to_str.h> -#include <epan/dissectors/packet-mpeg-sect.h> +#include "packet-mpeg-sect.h" void proto_register_dvb_data_mpe(void); void proto_reg_handoff_dvb_data_mpe(void); diff --git a/epan/dissectors/packet-dvb-eit.c b/epan/dissectors/packet-dvb-eit.c index 4de1770100..362fa0f118 100644 --- a/epan/dissectors/packet-dvb-eit.c +++ b/epan/dissectors/packet-dvb-eit.c @@ -23,11 +23,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <epan/dissectors/packet-mpeg-sect.h> - +#include "packet-mpeg-sect.h" #include "packet-mpeg-descriptor.h" void proto_register_dvb_eit(void); diff --git a/epan/dissectors/packet-dvb-ipdc.c b/epan/dissectors/packet-dvb-ipdc.c index 0f77e57baa..aa5064930f 100644 --- a/epan/dissectors/packet-dvb-ipdc.c +++ b/epan/dissectors/packet-dvb-ipdc.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> void proto_register_dvb_ipdc(void); diff --git a/epan/dissectors/packet-dvb-nit.c b/epan/dissectors/packet-dvb-nit.c index 7ccab92cd9..315a1175a0 100644 --- a/epan/dissectors/packet-dvb-nit.c +++ b/epan/dissectors/packet-dvb-nit.c @@ -23,11 +23,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <epan/dissectors/packet-mpeg-sect.h> - +#include "packet-mpeg-sect.h" #include "packet-mpeg-descriptor.h" void proto_register_dvb_nit(void); diff --git a/epan/dissectors/packet-dvb-s2-bb.c b/epan/dissectors/packet-dvb-s2-bb.c index 5d63bf6d55..645d95c65f 100644 --- a/epan/dissectors/packet-dvb-s2-bb.c +++ b/epan/dissectors/packet-dvb-s2-bb.c @@ -30,7 +30,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-dvb-sdt.c b/epan/dissectors/packet-dvb-sdt.c index 20df8cc29a..a179685c32 100644 --- a/epan/dissectors/packet-dvb-sdt.c +++ b/epan/dissectors/packet-dvb-sdt.c @@ -23,11 +23,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <epan/dissectors/packet-mpeg-sect.h> - +#include "packet-mpeg-sect.h" #include "packet-mpeg-descriptor.h" void proto_register_dvb_sdt(void); diff --git a/epan/dissectors/packet-dvb-tdt.c b/epan/dissectors/packet-dvb-tdt.c index a7954f1cc8..9bd5f724f8 100644 --- a/epan/dissectors/packet-dvb-tdt.c +++ b/epan/dissectors/packet-dvb-tdt.c @@ -23,10 +23,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <epan/dissectors/packet-mpeg-sect.h> +#include "packet-mpeg-sect.h" void proto_register_dvb_tdt(void); void proto_reg_handoff_dvb_tdt(void); diff --git a/epan/dissectors/packet-dvb-tot.c b/epan/dissectors/packet-dvb-tot.c index 98e485875a..3cc4eb6037 100644 --- a/epan/dissectors/packet-dvb-tot.c +++ b/epan/dissectors/packet-dvb-tot.c @@ -23,10 +23,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <epan/dissectors/packet-mpeg-sect.h> +#include "packet-mpeg-sect.h" #include "packet-mpeg-descriptor.h" diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c index 632576f02d..434d99010b 100644 --- a/epan/dissectors/packet-dvbci.c +++ b/epan/dissectors/packet-dvbci.c @@ -31,24 +31,22 @@ #include "config.h" -#include <glib.h> +#include <epan/packet.h> #include <epan/addr_resolv.h> #include <epan/circuit.h> #include <epan/dvb_chartbl.h> -#include <epan/packet.h> #include <epan/exported_pdu.h> #include <epan/reassemble.h> #include <epan/prefs.h> #include <epan/tap.h> #include <epan/expert.h> #include <epan/asn1.h> -#include <epan/dissectors/packet-dvbci.h> -#include <epan/dissectors/packet-mpeg-descriptor.h> -#include <epan/dissectors/packet-mpeg-sect.h> -#include <epan/dissectors/packet-mpeg-pmt.h> -#include <epan/dissectors/packet-x509af.h> -#include <epan/dissectors/packet-x509ce.h> - +#include "packet-dvbci.h" +#include "packet-mpeg-descriptor.h" +#include "packet-mpeg-sect.h" +#include "packet-mpeg-pmt.h" +#include "packet-x509af.h" +#include "packet-x509ce.h" #include "packet-ber.h" #ifdef HAVE_LIBGCRYPT diff --git a/epan/dissectors/packet-dvmrp.c b/epan/dissectors/packet-dvmrp.c index 59293b661d..f003b34e79 100644 --- a/epan/dissectors/packet-dvmrp.c +++ b/epan/dissectors/packet-dvmrp.c @@ -51,8 +51,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/ipproto.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-e164.c b/epan/dissectors/packet-e164.c index 3220d0225a..3884d82c02 100644 --- a/epan/dissectors/packet-e164.c +++ b/epan/dissectors/packet-e164.c @@ -30,7 +30,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-e164.h" diff --git a/epan/dissectors/packet-e212.c b/epan/dissectors/packet-e212.c index d063434abc..5d91096418 100644 --- a/epan/dissectors/packet-e212.c +++ b/epan/dissectors/packet-e212.c @@ -32,11 +32,10 @@ #include "config.h" -#include <glib.h> -#include <epan/packet.h> -#include <epan/wmem/wmem.h> #include <stdlib.h> +#include <epan/packet.h> + #include "packet-e212.h" #include "expert.h" diff --git a/epan/dissectors/packet-eap.c b/epan/dissectors/packet-eap.c index 9e9d8e4728..a45a1f7f81 100644 --- a/epan/dissectors/packet-eap.c +++ b/epan/dissectors/packet-eap.c @@ -23,12 +23,10 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/conversation.h> #include <epan/ppptypes.h> #include <epan/reassemble.h> -#include <epan/wmem/wmem.h> #include <epan/eap.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-eapol.c b/epan/dissectors/packet-eapol.c index 478f3e3861..e05d29729f 100644 --- a/epan/dissectors/packet-eapol.c +++ b/epan/dissectors/packet-eapol.c @@ -24,7 +24,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/crypt/wep-wpadefs.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-echo.c b/epan/dissectors/packet-echo.c index 9d8f00dfe1..54036fbf1f 100644 --- a/epan/dissectors/packet-echo.c +++ b/epan/dissectors/packet-echo.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #define ECHO_PORT 7 diff --git a/epan/dissectors/packet-ecp-oui.c b/epan/dissectors/packet-ecp-oui.c index 0ec00d6e93..35aed01aaf 100644 --- a/epan/dissectors/packet-ecp-oui.c +++ b/epan/dissectors/packet-ecp-oui.c @@ -25,7 +25,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/oui.h> #include <epan/addr_resolv.h> diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c index 3101d68ecb..3187aefb76 100644 --- a/epan/dissectors/packet-edonkey.c +++ b/epan/dissectors/packet-edonkey.c @@ -35,11 +35,8 @@ #include <stdlib.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> #include "packet-edonkey.h" #include "packet-tcp.h" diff --git a/epan/dissectors/packet-ehdlc.c b/epan/dissectors/packet-ehdlc.c index 34a4ac7f04..2197c34652 100644 --- a/epan/dissectors/packet-ehdlc.c +++ b/epan/dissectors/packet-ehdlc.c @@ -28,8 +28,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/ipproto.h> #include <epan/xdlc.h> diff --git a/epan/dissectors/packet-ehs.c b/epan/dissectors/packet-ehs.c index 78ba193174..70b8e72349 100644 --- a/epan/dissectors/packet-ehs.c +++ b/epan/dissectors/packet-ehs.c @@ -24,7 +24,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> void proto_register_ehs(void); diff --git a/epan/dissectors/packet-eigrp.c b/epan/dissectors/packet-eigrp.c index aa1e0db248..9855ef4e3a 100644 --- a/epan/dissectors/packet-eigrp.c +++ b/epan/dissectors/packet-eigrp.c @@ -26,14 +26,12 @@ */ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/guid-utils.h> #include <epan/addr_resolv.h> #include <epan/atalk-utils.h> #include <epan/addr_and_mask.h> #include <epan/ipproto.h> -#include <epan/tfs.h> #include <epan/expert.h> #include <epan/reassemble.h> diff --git a/epan/dissectors/packet-eiss.c b/epan/dissectors/packet-eiss.c index a952234469..924223f68c 100644 --- a/epan/dissectors/packet-eiss.c +++ b/epan/dissectors/packet-eiss.c @@ -24,11 +24,9 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> -#include <epan/dissectors/packet-mpeg-sect.h> +#include "packet-mpeg-sect.h" void proto_register_eiss(void); void proto_reg_handoff_eiss(void); diff --git a/epan/dissectors/packet-elasticsearch.c b/epan/dissectors/packet-elasticsearch.c index dc9a1f7204..4722f10f40 100644 --- a/epan/dissectors/packet-elasticsearch.c +++ b/epan/dissectors/packet-elasticsearch.c @@ -21,9 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "config.h" -#include "packet-tcp.h" + +#include <epan/packet.h> #include <epan/expert.h> -#include <epan/proto.h> +#include "packet-tcp.h" #define ELASTICSEARCH_DISCOVERY_PORT 54328 #define ELASTICSEARCH_BINARY_PORT 9300 diff --git a/epan/dissectors/packet-elmi.c b/epan/dissectors/packet-elmi.c index a376856dea..56c1d22de4 100644 --- a/epan/dissectors/packet-elmi.c +++ b/epan/dissectors/packet-elmi.c @@ -29,7 +29,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-enc.c b/epan/dissectors/packet-enc.c index ed1caf8d32..2961eeb5a8 100644 --- a/epan/dissectors/packet-enc.c +++ b/epan/dissectors/packet-enc.c @@ -25,7 +25,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/etypes.h> #include <epan/addr_resolv.h> diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c index 297e391f51..3662f84834 100644 --- a/epan/dissectors/packet-enip.c +++ b/epan/dissectors/packet-enip.c @@ -35,10 +35,7 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include <epan/conversation.h> #include <epan/dissector_filters.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-enttec.c b/epan/dissectors/packet-enttec.c index fef54d6c86..81a54abda1 100644 --- a/epan/dissectors/packet-enttec.c +++ b/epan/dissectors/packet-enttec.c @@ -26,13 +26,9 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/addr_resolv.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> - /* * See * diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c index 001f13e9f4..f0c87d9056 100644 --- a/epan/dissectors/packet-epl.c +++ b/epan/dissectors/packet-epl.c @@ -46,7 +46,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/etypes.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-epl_v1.c b/epan/dissectors/packet-epl_v1.c index 76359f121c..b0aa02591c 100644 --- a/epan/dissectors/packet-epl_v1.c +++ b/epan/dissectors/packet-epl_v1.c @@ -32,11 +32,8 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/etypes.h> -#include <epan/emem.h> - void proto_register_epl_v1(void); void proto_reg_handoff_epl_v1(void); diff --git a/epan/dissectors/packet-epon.c b/epan/dissectors/packet-epon.c index 346f197679..4733358c5e 100644 --- a/epan/dissectors/packet-epon.c +++ b/epan/dissectors/packet-epon.c @@ -29,7 +29,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-erf.c b/epan/dissectors/packet-erf.c index 033e184a61..86042c0df6 100644 --- a/epan/dissectors/packet-erf.c +++ b/epan/dissectors/packet-erf.c @@ -22,12 +22,9 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> - #include "packet-erf.h" /* diff --git a/epan/dissectors/packet-erldp.c b/epan/dissectors/packet-erldp.c index a471c65c9d..1f4c682a7e 100644 --- a/epan/dissectors/packet-erldp.c +++ b/epan/dissectors/packet-erldp.c @@ -29,10 +29,8 @@ #include <epan/packet.h> #include <epan/strutil.h> -#include <epan/wmem/wmem.h> - -#include <epan/dissectors/packet-tcp.h> -#include <epan/dissectors/packet-epmd.h> +#include "packet-tcp.h" +#include "packet-epmd.h" #define ERL_PASS_THROUGH 'p' diff --git a/epan/dissectors/packet-esio.c b/epan/dissectors/packet-esio.c index aa4ac5833f..839e48c2f8 100644 --- a/epan/dissectors/packet-esio.c +++ b/epan/dissectors/packet-esio.c @@ -23,7 +23,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-esis.c b/epan/dissectors/packet-esis.c index 5fa0ace52a..16dfffc571 100644 --- a/epan/dissectors/packet-esis.c +++ b/epan/dissectors/packet-esis.c @@ -25,7 +25,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include <wsutil/pint.h> diff --git a/epan/dissectors/packet-etch.c b/epan/dissectors/packet-etch.c index 40a62e51cb..a0c23b831c 100644 --- a/epan/dissectors/packet-etch.c +++ b/epan/dissectors/packet-etch.c @@ -30,17 +30,14 @@ #include "config.h" -#include <glib.h> - #include <stdio.h> #include <string.h> -#include <wsutil/file_util.h> -#include <wsutil/report_err.h> #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/dissectors/packet-tcp.h> -#include <epan/wmem/wmem.h> +#include <wsutil/file_util.h> +#include <wsutil/report_err.h> +#include "packet-tcp.h" void proto_register_etch(void); void proto_reg_handoff_etch(void); diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c index 9b61f5d1e0..0c6ea5008d 100644 --- a/epan/dissectors/packet-eth.c +++ b/epan/dissectors/packet-eth.c @@ -22,8 +22,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-etherip.c b/epan/dissectors/packet-etherip.c index 888a18841e..9ce80cb809 100644 --- a/epan/dissectors/packet-etherip.c +++ b/epan/dissectors/packet-etherip.c @@ -24,7 +24,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/ipproto.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c index 3ee8d3307b..24cf7310ff 100644 --- a/epan/dissectors/packet-ethertype.c +++ b/epan/dissectors/packet-ethertype.c @@ -26,7 +26,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-etsi_card_app_toolkit.c b/epan/dissectors/packet-etsi_card_app_toolkit.c index 7a720d2338..e4c0fea325 100644 --- a/epan/dissectors/packet-etsi_card_app_toolkit.c +++ b/epan/dissectors/packet-etsi_card_app_toolkit.c @@ -26,10 +26,7 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <epan/emem.h> #include <epan/lapd_sapi.h> #include "packet-e212.h" diff --git a/epan/dissectors/packet-etv.c b/epan/dissectors/packet-etv.c index de2ca93dbf..59e9516551 100644 --- a/epan/dissectors/packet-etv.c +++ b/epan/dissectors/packet-etv.c @@ -24,11 +24,9 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> -#include <epan/dissectors/packet-mpeg-sect.h> +#include "packet-mpeg-sect.h" void proto_register_etv(void); void proto_reg_handoff_etv(void); diff --git a/epan/dissectors/packet-exec.c b/epan/dissectors/packet-exec.c index f28190101a..6f6f81d45d 100644 --- a/epan/dissectors/packet-exec.c +++ b/epan/dissectors/packet-exec.c @@ -25,11 +25,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> #include <epan/prefs.h> #include <wsutil/str_util.h> diff --git a/epan/dissectors/packet-exported_pdu.c b/epan/dissectors/packet-exported_pdu.c index 2cbc331210..6ea0881c34 100644 --- a/epan/dissectors/packet-exported_pdu.c +++ b/epan/dissectors/packet-exported_pdu.c @@ -23,15 +23,11 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <wiretap/wtap.h> #include <epan/to_str.h> #include <epan/tap.h> #include <epan/exported_pdu.h> -#include <epan/wmem/wmem.h> - #include "packet-mtp3.h" #include "packet-dvbci.h" diff --git a/epan/dissectors/packet-extreme.c b/epan/dissectors/packet-extreme.c index 2e157b35e2..2a58213581 100644 --- a/epan/dissectors/packet-extreme.c +++ b/epan/dissectors/packet-extreme.c @@ -141,7 +141,6 @@ These are the structures you will see most often in EDP frames. #include "config.h" #include <string.h> -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include <epan/to_str.h> diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c index 46f9ca7fdb..ca5230a6a6 100644 --- a/epan/dissectors/packet-fc.c +++ b/epan/dissectors/packet-fc.c @@ -25,8 +25,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/prefs.h> @@ -40,7 +38,6 @@ #include "packet-fclctl.h" #include "packet-fcbls.h" #include <epan/tap.h> -#include <epan/wmem/wmem.h> #include <epan/crc32-tvb.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-fcct.c b/epan/dissectors/packet-fcct.c index 9f18905a22..e8d7d7a50f 100644 --- a/epan/dissectors/packet-fcct.c +++ b/epan/dissectors/packet-fcct.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/to_str.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-fcdns.c b/epan/dissectors/packet-fcdns.c index 5aba809604..49c30f6786 100644 --- a/epan/dissectors/packet-fcdns.c +++ b/epan/dissectors/packet-fcdns.c @@ -25,12 +25,9 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include <epan/to_str.h> -#include <epan/wmem/wmem.h> #include <epan/conversation.h> #include <epan/etypes.h> #include "packet-fc.h" diff --git a/epan/dissectors/packet-fcels.c b/epan/dissectors/packet-fcels.c index 285ec37e21..3d39a50663 100644 --- a/epan/dissectors/packet-fcels.c +++ b/epan/dissectors/packet-fcels.c @@ -28,11 +28,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/to_str.h> -#include <epan/wmem/wmem.h> #include <epan/conversation.h> #include <epan/etypes.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-fcfcs.c b/epan/dissectors/packet-fcfcs.c index 1d3ee27a62..54090d4d95 100644 --- a/epan/dissectors/packet-fcfcs.c +++ b/epan/dissectors/packet-fcfcs.c @@ -23,11 +23,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/to_str.h> -#include <epan/wmem/wmem.h> #include <epan/conversation.h> #include <epan/etypes.h> #include "packet-fc.h" diff --git a/epan/dissectors/packet-fcfzs.c b/epan/dissectors/packet-fcfzs.c index 75a484bee5..86e053ba1c 100644 --- a/epan/dissectors/packet-fcfzs.c +++ b/epan/dissectors/packet-fcfzs.c @@ -23,11 +23,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/to_str.h> -#include <epan/wmem/wmem.h> #include <epan/conversation.h> #include <epan/expert.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-fcip.c b/epan/dissectors/packet-fcip.c index 59c7511848..ecb94f07b4 100644 --- a/epan/dissectors/packet-fcip.c +++ b/epan/dissectors/packet-fcip.c @@ -24,8 +24,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/to_str.h> diff --git a/epan/dissectors/packet-fclctl.c b/epan/dissectors/packet-fclctl.c index eeb50f3d4c..ba5985b776 100644 --- a/epan/dissectors/packet-fclctl.c +++ b/epan/dissectors/packet-fclctl.c @@ -23,10 +23,7 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include <epan/etypes.h> #include "packet-fc.h" #include "packet-fclctl.h" diff --git a/epan/dissectors/packet-fcoe.c b/epan/dissectors/packet-fcoe.c index e793f5b3a9..e7458ca5a8 100644 --- a/epan/dissectors/packet-fcoe.c +++ b/epan/dissectors/packet-fcoe.c @@ -30,14 +30,11 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/crc32-tvb.h> #include <epan/etypes.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> #include "packet-fc.h" void proto_register_fcoe(void); diff --git a/epan/dissectors/packet-fcoib.c b/epan/dissectors/packet-fcoib.c index 3c0b4f029c..750a544bf3 100644 --- a/epan/dissectors/packet-fcoib.c +++ b/epan/dissectors/packet-fcoib.c @@ -27,14 +27,14 @@ #include "config.h" #include <stdlib.h> +#include <errno.h> + #include <epan/packet.h> #include <epan/prefs.h> #include <epan/crc32-tvb.h> #include <epan/etypes.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> #include <epan/addr_resolv.h> -#include <errno.h> #include "packet-infiniband.h" #include "packet-fc.h" diff --git a/epan/dissectors/packet-fcp.c b/epan/dissectors/packet-fcp.c index 5558dc782d..55be8ed408 100644 --- a/epan/dissectors/packet-fcp.c +++ b/epan/dissectors/packet-fcp.c @@ -23,9 +23,6 @@ #include "config.h" -#include <glib.h> - -#include <epan/wmem/wmem.h> #include <epan/packet.h> #include <epan/conversation.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-fcsb3.c b/epan/dissectors/packet-fcsb3.c index afd6dafcf5..b62a88425d 100644 --- a/epan/dissectors/packet-fcsb3.c +++ b/epan/dissectors/packet-fcsb3.c @@ -24,8 +24,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/conversation.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-fcsp.c b/epan/dissectors/packet-fcsp.c index c387210444..55c1bb0474 100644 --- a/epan/dissectors/packet-fcsp.c +++ b/epan/dissectors/packet-fcsp.c @@ -24,8 +24,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/to_str.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c index 75ef72cd81..dafcf82939 100644 --- a/epan/dissectors/packet-fcswils.c +++ b/epan/dissectors/packet-fcswils.c @@ -23,12 +23,9 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include <epan/to_str.h> -#include <epan/wmem/wmem.h> #include <epan/conversation.h> #include <epan/etypes.h> #include "packet-fc.h" diff --git a/epan/dissectors/packet-fddi.c b/epan/dissectors/packet-fddi.c index c37c310cce..b51e46770e 100644 --- a/epan/dissectors/packet-fddi.c +++ b/epan/dissectors/packet-fddi.c @@ -28,8 +28,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <wsutil/bitswap.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-ff.c b/epan/dissectors/packet-ff.c index 380e0c188e..bc7bb7519f 100644 --- a/epan/dissectors/packet-ff.c +++ b/epan/dissectors/packet-ff.c @@ -41,8 +41,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include "packet-ff.h" #include "packet-tcp.h" diff --git a/epan/dissectors/packet-finger.c b/epan/dissectors/packet-finger.c index 1be09437ba..612ab7ba46 100644 --- a/epan/dissectors/packet-finger.c +++ b/epan/dissectors/packet-finger.c @@ -22,10 +22,8 @@ */ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> #include <epan/expert.h> void proto_register_finger(void); diff --git a/epan/dissectors/packet-fip.c b/epan/dissectors/packet-fip.c index 81db1a35ab..7a20ce8b02 100644 --- a/epan/dissectors/packet-fip.c +++ b/epan/dissectors/packet-fip.c @@ -34,8 +34,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/to_str.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-fix.c b/epan/dissectors/packet-fix.c index 1d2f020e2c..5439c66013 100644 --- a/epan/dissectors/packet-fix.c +++ b/epan/dissectors/packet-fix.c @@ -30,8 +30,6 @@ #include <stdlib.h> #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-flexnet.c b/epan/dissectors/packet-flexnet.c index 7a9b47bd93..78c339bd25 100644 --- a/epan/dissectors/packet-flexnet.c +++ b/epan/dissectors/packet-flexnet.c @@ -36,8 +36,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/ax25_pids.h> diff --git a/epan/dissectors/packet-flip.c b/epan/dissectors/packet-flip.c index 7b3718ec5d..2ca5b08c2b 100644 --- a/epan/dissectors/packet-flip.c +++ b/epan/dissectors/packet-flip.c @@ -50,7 +50,6 @@ #include <epan/in_cksum.h> #include <epan/prefs.h> -#include <epan/emem.h> #include <epan/strutil.h> #include <epan/rtp_pt.h> diff --git a/epan/dissectors/packet-fmp_notify.c b/epan/dissectors/packet-fmp_notify.c index 777a583408..5a46474cd8 100644 --- a/epan/dissectors/packet-fmp_notify.c +++ b/epan/dissectors/packet-fmp_notify.c @@ -22,9 +22,7 @@ #include "config.h" - -#include <glib.h> - +#include <epan/packet.h> #include <epan/strutil.h> #include "packet-rpc.h" diff --git a/epan/dissectors/packet-forces.c b/epan/dissectors/packet-forces.c index 66c5b3ca28..ac014e0b6f 100644 --- a/epan/dissectors/packet-forces.c +++ b/epan/dissectors/packet-forces.c @@ -24,8 +24,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-foundry.c b/epan/dissectors/packet-foundry.c index 473faea2b3..8711c539f0 100644 --- a/epan/dissectors/packet-foundry.c +++ b/epan/dissectors/packet-foundry.c @@ -25,7 +25,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-fp_hint.c b/epan/dissectors/packet-fp_hint.c index b475049196..7aebcd3715 100644 --- a/epan/dissectors/packet-fp_hint.c +++ b/epan/dissectors/packet-fp_hint.c @@ -23,11 +23,8 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <wiretap/wtap.h> -#include <epan/wmem/wmem.h> #include <epan/conversation.h> #include <epan/expert.h> #include "packet-umts_fp.h" diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c index 91358b084b..51dc6821b8 100644 --- a/epan/dissectors/packet-fr.c +++ b/epan/dissectors/packet-fr.c @@ -34,8 +34,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c index bed2d82dcf..b8767108e1 100644 --- a/epan/dissectors/packet-frame.c +++ b/epan/dissectors/packet-frame.c @@ -27,12 +27,8 @@ #include <windows.h> #endif -#include <glib.h> - -#include <wsutil/md5.h> - -#include <epan/epan.h> #include <epan/packet.h> +#include <epan/epan.h> #include <epan/exceptions.h> #include <epan/show_exception.h> #include <epan/timestamp.h> @@ -41,6 +37,7 @@ #include <wiretap/wtap.h> #include <epan/tap.h> #include <epan/expert.h> +#include <wsutil/md5.h> #include "packet-frame.h" diff --git a/epan/dissectors/packet-ftp.c b/epan/dissectors/packet-ftp.c index 1b9ce094d2..fc43b718bc 100644 --- a/epan/dissectors/packet-ftp.c +++ b/epan/dissectors/packet-ftp.c @@ -30,12 +30,10 @@ #include <stdlib.h> #include <string.h> -#include <glib.h> #include <epan/packet.h> #include <epan/strutil.h> #include <epan/conversation.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> #include <epan/addr_resolv.h> void proto_register_ftp(void); diff --git a/epan/dissectors/packet-fw1.c b/epan/dissectors/packet-fw1.c index 2aa46701bc..92b6544e42 100644 --- a/epan/dissectors/packet-fw1.c +++ b/epan/dissectors/packet-fw1.c @@ -83,10 +83,8 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> #include <epan/etypes.h> void proto_register_fw1(void); diff --git a/epan/dissectors/packet-g723.c b/epan/dissectors/packet-g723.c index efe8790e0f..8d0a7c6db3 100644 --- a/epan/dissectors/packet-g723.c +++ b/epan/dissectors/packet-g723.c @@ -25,8 +25,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/rtp_pt.h> diff --git a/epan/dissectors/packet-gadu-gadu.c b/epan/dissectors/packet-gadu-gadu.c index aed854d9f4..1f0c4e8650 100644 --- a/epan/dissectors/packet-gadu-gadu.c +++ b/epan/dissectors/packet-gadu-gadu.c @@ -27,13 +27,9 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> - -#include <epan/dissectors/packet-tcp.h> +#include "packet-tcp.h" void proto_register_gadu_gadu(void); void proto_reg_handoff_gadu_gadu(void); diff --git a/epan/dissectors/packet-gdb.c b/epan/dissectors/packet-gdb.c index 16f83d2eb2..b87f7e7b24 100644 --- a/epan/dissectors/packet-gdb.c +++ b/epan/dissectors/packet-gdb.c @@ -34,9 +34,8 @@ #include "config.h" -#include <glib.h> -#include <epan/expert.h> #include <epan/packet.h> +#include <epan/expert.h> #include <epan/tvbparse.h> enum { diff --git a/epan/dissectors/packet-gdsdb.c b/epan/dissectors/packet-gdsdb.c index 656a6129a7..7f4e08651d 100644 --- a/epan/dissectors/packet-gdsdb.c +++ b/epan/dissectors/packet-gdsdb.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> void proto_register_gdsdb(void); diff --git a/epan/dissectors/packet-ged125.c b/epan/dissectors/packet-ged125.c index 69541d74a3..6bf0ea64bd 100644 --- a/epan/dissectors/packet-ged125.c +++ b/epan/dissectors/packet-ged125.c @@ -40,8 +40,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-geneve.c b/epan/dissectors/packet-geneve.c index 6505dd2b95..27e7108d8c 100644 --- a/epan/dissectors/packet-geneve.c +++ b/epan/dissectors/packet-geneve.c @@ -27,9 +27,9 @@ #include "config.h" +#include <epan/packet.h> #include <epan/etypes.h> #include <epan/expert.h> -#include <epan/packet.h> #define UDP_PORT_GENEVE 6081 #define GENEVE_VER 0 diff --git a/epan/dissectors/packet-gift.c b/epan/dissectors/packet-gift.c index 1e659e69a6..f911290127 100644 --- a/epan/dissectors/packet-gift.c +++ b/epan/dissectors/packet-gift.c @@ -25,8 +25,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c index 5a4403413b..4677e20858 100644 --- a/epan/dissectors/packet-giop.c +++ b/epan/dissectors/packet-giop.c @@ -281,13 +281,11 @@ #include <string.h> #include <stdio.h> #include <errno.h> -#include <glib.h> #include <math.h> #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> #include <epan/prefs.h> #include <epan/expert.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-git.c b/epan/dissectors/packet-git.c index b41aa5dc01..d5559257f8 100644 --- a/epan/dissectors/packet-git.c +++ b/epan/dissectors/packet-git.c @@ -28,8 +28,6 @@ #include <stdio.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include "packet-tcp.h" diff --git a/epan/dissectors/packet-glbp.c b/epan/dissectors/packet-glbp.c index 1ed0834364..9b7eac9c4a 100644 --- a/epan/dissectors/packet-glbp.c +++ b/epan/dissectors/packet-glbp.c @@ -38,7 +38,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-gluster_cli.c b/epan/dissectors/packet-gluster_cli.c index a866d07909..33a9e8c5d0 100644 --- a/epan/dissectors/packet-gluster_cli.c +++ b/epan/dissectors/packet-gluster_cli.c @@ -33,8 +33,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include "packet-rpc.h" diff --git a/epan/dissectors/packet-gluster_pmap.c b/epan/dissectors/packet-gluster_pmap.c index f462a163eb..d9f6f8b952 100644 --- a/epan/dissectors/packet-gluster_pmap.c +++ b/epan/dissectors/packet-gluster_pmap.c @@ -33,8 +33,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include "packet-rpc.h" diff --git a/epan/dissectors/packet-glusterd.c b/epan/dissectors/packet-glusterd.c index 110e8f8ec7..9cc348ba60 100644 --- a/epan/dissectors/packet-glusterd.c +++ b/epan/dissectors/packet-glusterd.c @@ -35,7 +35,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-rpc.h" diff --git a/epan/dissectors/packet-glusterfs.c b/epan/dissectors/packet-glusterfs.c index 1c991f563a..6a01ede667 100644 --- a/epan/dissectors/packet-glusterfs.c +++ b/epan/dissectors/packet-glusterfs.c @@ -33,8 +33,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/to_str.h> #include <epan/guid-utils.h> diff --git a/epan/dissectors/packet-glusterfs_hndsk.c b/epan/dissectors/packet-glusterfs_hndsk.c index f65f34d6e2..cf9635812c 100644 --- a/epan/dissectors/packet-glusterfs_hndsk.c +++ b/epan/dissectors/packet-glusterfs_hndsk.c @@ -33,8 +33,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include "packet-rpc.h" diff --git a/epan/dissectors/packet-gmr1_bcch.c b/epan/dissectors/packet-gmr1_bcch.c index ceb35d68ce..d2aacd60b8 100644 --- a/epan/dissectors/packet-gmr1_bcch.c +++ b/epan/dissectors/packet-gmr1_bcch.c @@ -29,10 +29,7 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> -#include <epan/wmem/wmem.h> - #include "packet-csn1.h" void proto_register_gmr1_bcch(void); diff --git a/epan/dissectors/packet-gmr1_common.c b/epan/dissectors/packet-gmr1_common.c index d09aaef7b9..bbcd871c7b 100644 --- a/epan/dissectors/packet-gmr1_common.c +++ b/epan/dissectors/packet-gmr1_common.c @@ -32,7 +32,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-gmr1_common.h" diff --git a/epan/dissectors/packet-gmr1_dtap.c b/epan/dissectors/packet-gmr1_dtap.c index 15084d6e33..bfee116cd3 100644 --- a/epan/dissectors/packet-gmr1_dtap.c +++ b/epan/dissectors/packet-gmr1_dtap.c @@ -29,7 +29,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-gmr1_common.h" diff --git a/epan/dissectors/packet-gmr1_rach.c b/epan/dissectors/packet-gmr1_rach.c index ce2230aabc..20a1b32d1e 100644 --- a/epan/dissectors/packet-gmr1_rach.c +++ b/epan/dissectors/packet-gmr1_rach.c @@ -31,8 +31,6 @@ #include "config.h" -#include <glib.h> - #include <stdlib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-gmr1_rr.c b/epan/dissectors/packet-gmr1_rr.c index d678b0cb6c..b171ebe503 100644 --- a/epan/dissectors/packet-gmr1_rr.c +++ b/epan/dissectors/packet-gmr1_rr.c @@ -32,7 +32,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-gmr1_common.h" diff --git a/epan/dissectors/packet-gmrp.c b/epan/dissectors/packet-gmrp.c index 1030af784b..6d66f89a83 100644 --- a/epan/dissectors/packet-gmrp.c +++ b/epan/dissectors/packet-gmrp.c @@ -26,8 +26,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include <epan/llcsaps.h> diff --git a/epan/dissectors/packet-gnutella.c b/epan/dissectors/packet-gnutella.c index d615e73e98..c9896968af 100644 --- a/epan/dissectors/packet-gnutella.c +++ b/epan/dissectors/packet-gnutella.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include "packet-gnutella.h" #include "packet-tcp.h" diff --git a/epan/dissectors/packet-gopher.c b/epan/dissectors/packet-gopher.c index d6001bbe9c..bad581df2c 100644 --- a/epan/dissectors/packet-gopher.c +++ b/epan/dissectors/packet-gopher.c @@ -30,8 +30,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-gpef.c b/epan/dissectors/packet-gpef.c index 6ec3cc1b50..26530b0c7e 100644 --- a/epan/dissectors/packet-gpef.c +++ b/epan/dissectors/packet-gpef.c @@ -24,7 +24,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-windows-common.h" #include <epan/asn1.h> diff --git a/epan/dissectors/packet-gprs-llc.c b/epan/dissectors/packet-gprs-llc.c index ab5f96c0c7..98d901bf40 100644 --- a/epan/dissectors/packet-gprs-llc.c +++ b/epan/dissectors/packet-gprs-llc.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-gre.c b/epan/dissectors/packet-gre.c index 029cb605be..dc1bce5dd1 100644 --- a/epan/dissectors/packet-gre.c +++ b/epan/dissectors/packet-gre.c @@ -23,7 +23,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/etypes.h> #include <epan/in_cksum.h> diff --git a/epan/dissectors/packet-gsm_a_bssmap.c b/epan/dissectors/packet-gsm_a_bssmap.c index 840c82c9c1..ce78c84f5a 100644 --- a/epan/dissectors/packet-gsm_a_bssmap.c +++ b/epan/dissectors/packet-gsm_a_bssmap.c @@ -38,12 +38,9 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/to_str.h> #include <epan/tap.h> -#include <epan/wmem/wmem.h> #include <epan/expert.h> #include <epan/asn1.h> diff --git a/epan/dissectors/packet-gsm_a_common.c b/epan/dissectors/packet-gsm_a_common.c index 05e7d44efc..a950939a8b 100644 --- a/epan/dissectors/packet-gsm_a_common.c +++ b/epan/dissectors/packet-gsm_a_common.c @@ -29,14 +29,10 @@ #include <math.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/to_str.h> #include <epan/expert.h> #include <epan/tap.h> -#include <epan/wmem/wmem.h> - #include "packet-bssap.h" #include "packet-sccp.h" #include "packet-gsm_a_common.h" diff --git a/epan/dissectors/packet-gsm_a_dtap.c b/epan/dissectors/packet-gsm_a_dtap.c index 5ad130439b..980526a1e6 100644 --- a/epan/dissectors/packet-gsm_a_dtap.c +++ b/epan/dissectors/packet-gsm_a_dtap.c @@ -99,12 +99,9 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include <epan/tap.h> -#include <epan/wmem/wmem.h> #include <epan/asn1.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-gsm_a_gm.c b/epan/dissectors/packet-gsm_a_gm.c index 1910b89de5..6525753a2e 100644 --- a/epan/dissectors/packet-gsm_a_gm.c +++ b/epan/dissectors/packet-gsm_a_gm.c @@ -80,8 +80,7 @@ #include <epan/expert.h> #include <epan/tap.h> #include <epan/asn1.h> -#include <epan/wmem/wmem.h> - +#include <epan/ipproto.h> #include "packet-bssap.h" #include "packet-sccp.h" #include "packet-ber.h" @@ -89,7 +88,6 @@ #include "packet-gsm_a_common.h" #include "packet-e212.h" #include "packet-ppp.h" -#include "ipproto.h" #include "packet-gsm_map.h" void proto_register_gsm_a_gm(void); diff --git a/epan/dissectors/packet-gsm_a_rp.c b/epan/dissectors/packet-gsm_a_rp.c index d8f11122d4..eb2fde3031 100644 --- a/epan/dissectors/packet-gsm_a_rp.c +++ b/epan/dissectors/packet-gsm_a_rp.c @@ -32,8 +32,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/to_str.h> #include <epan/tap.h> diff --git a/epan/dissectors/packet-gsm_abis_om2000.c b/epan/dissectors/packet-gsm_abis_om2000.c index f49301369f..730f1bd71c 100644 --- a/epan/dissectors/packet-gsm_abis_om2000.c +++ b/epan/dissectors/packet-gsm_abis_om2000.c @@ -28,15 +28,13 @@ #include "config.h" -#include <glib.h> +#include <stdio.h> #include <epan/packet.h> -#include <epan/emem.h> #include <epan/lapd_sapi.h> #include "packet-gsm_a_common.h" -#include <stdio.h> void proto_register_abis_om2000(void); diff --git a/epan/dissectors/packet-gsm_abis_oml.c b/epan/dissectors/packet-gsm_abis_oml.c index 8adaece769..699af49256 100644 --- a/epan/dissectors/packet-gsm_abis_oml.c +++ b/epan/dissectors/packet-gsm_abis_oml.c @@ -25,11 +25,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> -#include <epan/emem.h> #include <epan/lapd_sapi.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-gsm_bsslap.c b/epan/dissectors/packet-gsm_bsslap.c index 535cd54fac..9272f2afa1 100644 --- a/epan/dissectors/packet-gsm_bsslap.c +++ b/epan/dissectors/packet-gsm_bsslap.c @@ -25,8 +25,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include "packet-gsm_a_common.h" diff --git a/epan/dissectors/packet-gsm_bssmap_le.c b/epan/dissectors/packet-gsm_bssmap_le.c index 154600952d..ca4c961d93 100644 --- a/epan/dissectors/packet-gsm_bssmap_le.c +++ b/epan/dissectors/packet-gsm_bssmap_le.c @@ -26,13 +26,9 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include <epan/tap.h> -#include <epan/wmem/wmem.h> - #include "packet-bssap.h" #include "packet-sccp.h" #include "packet-gsm_a_common.h" diff --git a/epan/dissectors/packet-gsm_ipa.c b/epan/dissectors/packet-gsm_ipa.c index 508c78d89b..e6236bc738 100644 --- a/epan/dissectors/packet-gsm_ipa.c +++ b/epan/dissectors/packet-gsm_ipa.c @@ -24,8 +24,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/ipproto.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-gsm_rlcmac.c b/epan/dissectors/packet-gsm_rlcmac.c index f1b9460704..a4868ec4ea 100644 --- a/epan/dissectors/packet-gsm_rlcmac.c +++ b/epan/dissectors/packet-gsm_rlcmac.c @@ -48,11 +48,8 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> - #include "packet-csn1.h" #include "packet-gsm_a_rr.h" diff --git a/epan/dissectors/packet-gsm_sim.c b/epan/dissectors/packet-gsm_sim.c index 3d27536f10..e88f1021a0 100644 --- a/epan/dissectors/packet-gsm_sim.c +++ b/epan/dissectors/packet-gsm_sim.c @@ -26,10 +26,7 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <epan/emem.h> #include <epan/lapd_sapi.h> void proto_register_gsm_sim(void); diff --git a/epan/dissectors/packet-gsm_sms.c b/epan/dissectors/packet-gsm_sms.c index 8baf6f8c08..c8d731844e 100644 --- a/epan/dissectors/packet-gsm_sms.c +++ b/epan/dissectors/packet-gsm_sms.c @@ -35,8 +35,6 @@ #include "config.h" -#include <glib.h> - #include <string.h> #include <epan/packet.h> @@ -44,8 +42,6 @@ #include <epan/prefs.h> #include <epan/reassemble.h> #include <epan/to_str.h> -#include <epan/wmem/wmem.h> - #include "packet-gsm_sms.h" void proto_register_gsm_sms(void); diff --git a/epan/dissectors/packet-gsm_sms_ud.c b/epan/dissectors/packet-gsm_sms_ud.c index d2782a2b25..139671f42f 100644 --- a/epan/dissectors/packet-gsm_sms_ud.c +++ b/epan/dissectors/packet-gsm_sms_ud.c @@ -56,8 +56,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-gsm_um.c b/epan/dissectors/packet-gsm_um.c index d7daae719e..ee27ae2116 100644 --- a/epan/dissectors/packet-gsm_um.c +++ b/epan/dissectors/packet-gsm_um.c @@ -24,8 +24,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <wiretap/wtap.h> diff --git a/epan/dissectors/packet-gsmtap.c b/epan/dissectors/packet-gsmtap.c index 1d5d07714a..ab25514e36 100644 --- a/epan/dissectors/packet-gsmtap.c +++ b/epan/dissectors/packet-gsmtap.c @@ -40,7 +40,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-tetra.h" diff --git a/epan/dissectors/packet-gssapi.c b/epan/dissectors/packet-gssapi.c index 2434b5a113..5c127a4586 100644 --- a/epan/dissectors/packet-gssapi.c +++ b/epan/dissectors/packet-gssapi.c @@ -27,21 +27,18 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> #include <epan/prefs.h> #include <epan/reassemble.h> #include <epan/asn1.h> #include <epan/to_str.h> #include <epan/show_exception.h> -#include <epan/dissectors/packet-ber.h> -#include <epan/dissectors/packet-dcerpc.h> -#include <epan/dissectors/packet-gssapi.h> +#include "packet-ber.h" +#include "packet-dcerpc.h" +#include "packet-gssapi.h" void proto_register_gssapi(void); void proto_reg_handoff_gssapi(void); diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c index 6ef34c6658..d3934d3745 100644 --- a/epan/dissectors/packet-gtp.c +++ b/epan/dissectors/packet-gtp.c @@ -52,9 +52,8 @@ #include "config.h" -#include <epan/conversation.h> #include <epan/packet.h> -#include <epan/wmem/wmem.h> +#include <epan/conversation.h> #include <epan/prefs.h> #include <epan/expert.h> #include <epan/sminmpec.h> diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c index 5577c354d4..6ef575a321 100644 --- a/epan/dissectors/packet-gtpv2.c +++ b/epan/dissectors/packet-gtpv2.c @@ -25,8 +25,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/to_str.h> #include <epan/asn1.h> diff --git a/epan/dissectors/packet-gvcp.c b/epan/dissectors/packet-gvcp.c index 2658d79164..274cadb734 100644 --- a/epan/dissectors/packet-gvcp.c +++ b/epan/dissectors/packet-gvcp.c @@ -28,7 +28,6 @@ #include "config.h" #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include <epan/conversation.h> #define GVCP_MIN_PACKET_SIZE 8 diff --git a/epan/dissectors/packet-gvrp.c b/epan/dissectors/packet-gvrp.c index f48920b0d9..68328fd547 100644 --- a/epan/dissectors/packet-gvrp.c +++ b/epan/dissectors/packet-gvrp.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/llcsaps.h> diff --git a/epan/dissectors/packet-h1.c b/epan/dissectors/packet-h1.c index 71ee74d5ee..2c2cb3de59 100644 --- a/epan/dissectors/packet-h1.c +++ b/epan/dissectors/packet-h1.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> diff --git a/epan/dissectors/packet-h221_nonstd.c b/epan/dissectors/packet-h221_nonstd.c index 6510bb8d83..759f2bddf0 100644 --- a/epan/dissectors/packet-h221_nonstd.c +++ b/epan/dissectors/packet-h221_nonstd.c @@ -22,7 +22,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> void proto_register_nonstd(void); diff --git a/epan/dissectors/packet-h223.c b/epan/dissectors/packet-h223.c index 723711ce93..55f997d064 100644 --- a/epan/dissectors/packet-h223.c +++ b/epan/dissectors/packet-h223.c @@ -23,12 +23,11 @@ #include "config.h" -#include <glib.h> -#include <epan/wmem/wmem.h> -#include <wsutil/bitswap.h> +#include <string.h> + +#include <epan/packet.h> #include <epan/circuit.h> #include <epan/conversation.h> -#include <epan/packet.h> #include <epan/exceptions.h> #include <epan/stream.h> #include <epan/reassemble.h> @@ -36,13 +35,12 @@ #include <epan/iax2_codec_type.h> #include <epan/show_exception.h> #include <epan/asn1.h> -#include <epan/dissectors/packet-h245.h> -#include <epan/dissectors/packet-iax2.h> +#include <wsutil/bitswap.h> +#include "packet-h245.h" +#include "packet-iax2.h" #include "packet-h223.h" -#include <string.h> - /* #define DEBUG_H223 */ /* debug the mux-pdu defragmentation code. warning: verbose output! */ diff --git a/epan/dissectors/packet-h248_annex_e.c b/epan/dissectors/packet-h248_annex_e.c index 8af8e4208e..ba7618c134 100644 --- a/epan/dissectors/packet-h248_annex_e.c +++ b/epan/dissectors/packet-h248_annex_e.c @@ -27,8 +27,7 @@ /*****/ -#include <epan/proto.h> -#include <epan/tvbuff.h> +#include <epan/packet.h> #include <epan/tvbuff-int.h> #include <epan/tvbparse.h> /*****/ @@ -41,7 +40,7 @@ void proto_register_h248_annex_e(void); #define PSNAME "H248E" #define PFNAME "h248e" /* -#include <epan/dissectors/packet-alcap.h> +#include "packet-alcap.h" */ static int proto_h248_annex_E = -1; diff --git a/epan/dissectors/packet-h261.c b/epan/dissectors/packet-h261.c index 2fc05347d8..45717059dc 100644 --- a/epan/dissectors/packet-h261.c +++ b/epan/dissectors/packet-h261.c @@ -32,7 +32,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/rtp_pt.h> diff --git a/epan/dissectors/packet-h263.c b/epan/dissectors/packet-h263.c index 1b842f06b0..fbdd0d136a 100644 --- a/epan/dissectors/packet-h263.c +++ b/epan/dissectors/packet-h263.c @@ -32,7 +32,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-h263.h" diff --git a/epan/dissectors/packet-h263p.c b/epan/dissectors/packet-h263p.c index e3f669aafc..a517689e1f 100644 --- a/epan/dissectors/packet-h263p.c +++ b/epan/dissectors/packet-h263p.c @@ -29,7 +29,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-h264.c b/epan/dissectors/packet-h264.c index 202faf64cb..5114e9e4c2 100644 --- a/epan/dissectors/packet-h264.c +++ b/epan/dissectors/packet-h264.c @@ -32,15 +32,11 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/asn1.h> #include <epan/strutil.h> #include <epan/expert.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> - #include "packet-h264.h" void proto_register_h264(void); diff --git a/epan/dissectors/packet-hartip.c b/epan/dissectors/packet-hartip.c index 2d8e9d3cd5..e87997fd5a 100644 --- a/epan/dissectors/packet-hartip.c +++ b/epan/dissectors/packet-hartip.c @@ -24,14 +24,13 @@ */ #include "config.h" -#include <glib.h> -#include <epan/conversation.h> + #include <epan/packet.h> +#include <epan/conversation.h> #include <epan/tap.h> #include <epan/stats_tree.h> #include <epan/expert.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> #include "packet-tcp.h" void proto_register_hartip(void); diff --git a/epan/dissectors/packet-hazelcast.c b/epan/dissectors/packet-hazelcast.c index 62cc7f52ad..ae182a4ce5 100644 --- a/epan/dissectors/packet-hazelcast.c +++ b/epan/dissectors/packet-hazelcast.c @@ -34,7 +34,7 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/tap.h> -#include <packet-tcp.h> +#include "packet-tcp.h" void proto_register_hazelcast(void); void proto_reg_handoff_hazelcast(void); diff --git a/epan/dissectors/packet-hci_h1.c b/epan/dissectors/packet-hci_h1.c index bdea12dac4..2b1f9c9883 100644 --- a/epan/dissectors/packet-hci_h1.c +++ b/epan/dissectors/packet-hci_h1.c @@ -24,7 +24,6 @@ #include <epan/packet.h> #include <wiretap/wtap.h> -#include <epan/wmem/wmem.h> #include <wiretap/wtap.h> #include "packet-bluetooth.h" diff --git a/epan/dissectors/packet-hci_h4.c b/epan/dissectors/packet-hci_h4.c index 9e1f99bf71..df0d61c3aa 100644 --- a/epan/dissectors/packet-hci_h4.c +++ b/epan/dissectors/packet-hci_h4.c @@ -30,8 +30,6 @@ #include <epan/packet.h> #include <wiretap/wtap.h> -#include <epan/wmem/wmem.h> - #include "packet-bluetooth.h" static int proto_hci_h4 = -1; diff --git a/epan/dissectors/packet-hci_mon.c b/epan/dissectors/packet-hci_mon.c index 37744b5f7c..b5dae922b0 100644 --- a/epan/dissectors/packet-hci_mon.c +++ b/epan/dissectors/packet-hci_mon.c @@ -27,7 +27,6 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> #include <wiretap/wtap.h> #include "packet-bluetooth.h" diff --git a/epan/dissectors/packet-hci_usb.c b/epan/dissectors/packet-hci_usb.c index 9cc4a13704..4223bfb992 100644 --- a/epan/dissectors/packet-hci_usb.c +++ b/epan/dissectors/packet-hci_usb.c @@ -27,7 +27,6 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/reassemble.h> -#include <epan/wmem/wmem.h> #include <wiretap/wtap.h> #include "packet-bluetooth.h" diff --git a/epan/dissectors/packet-hdcp.c b/epan/dissectors/packet-hdcp.c index 2295a21258..e930c2f5a9 100644 --- a/epan/dissectors/packet-hdcp.c +++ b/epan/dissectors/packet-hdcp.c @@ -31,12 +31,9 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/ptvcursor.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> - void proto_register_hdcp(void); static int proto_hdcp = -1; diff --git a/epan/dissectors/packet-hdcp2.c b/epan/dissectors/packet-hdcp2.c index a1ea2d6c1f..9a17030a3a 100644 --- a/epan/dissectors/packet-hdcp2.c +++ b/epan/dissectors/packet-hdcp2.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> #include <epan/ptvcursor.h> diff --git a/epan/dissectors/packet-hdfs.c b/epan/dissectors/packet-hdfs.c index 871726f5f2..557df7ff20 100644 --- a/epan/dissectors/packet-hdfs.c +++ b/epan/dissectors/packet-hdfs.c @@ -27,11 +27,9 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <epan/dissectors/packet-tcp.h> #include <epan/prefs.h> +#include "packet-tcp.h" void proto_register_hdfs(void); void proto_reg_handoff_hdfs(void); diff --git a/epan/dissectors/packet-hdfsdata.c b/epan/dissectors/packet-hdfsdata.c index 46cec622c3..5b133b301f 100644 --- a/epan/dissectors/packet-hdfsdata.c +++ b/epan/dissectors/packet-hdfsdata.c @@ -29,7 +29,7 @@ #include <epan/packet.h> #include <epan/prefs.h> -#include "epan/dissectors/packet-tcp.h" +#include "packet-tcp.h" void proto_register_hdfsdata(void); void proto_reg_handoff_hdfsdata(void); diff --git a/epan/dissectors/packet-hdmi.c b/epan/dissectors/packet-hdmi.c index 8d059992fd..395b74c013 100644 --- a/epan/dissectors/packet-hdmi.c +++ b/epan/dissectors/packet-hdmi.c @@ -29,7 +29,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-hdmi.h" diff --git a/epan/dissectors/packet-hislip.c b/epan/dissectors/packet-hislip.c index 5fe7ce2099..c0d67602fd 100644 --- a/epan/dissectors/packet-hislip.c +++ b/epan/dissectors/packet-hislip.c @@ -29,13 +29,11 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/conversation.h> #include <epan/prefs.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> -#include <epan/dissectors/packet-tcp.h> +#include "packet-tcp.h" #define PROTO_TAG_HiSLIP "HiSLIP" #define FRAME_HEADER_LEN 16 diff --git a/epan/dissectors/packet-homeplug.c b/epan/dissectors/packet-homeplug.c index db46cee8d5..87a2fa9631 100644 --- a/epan/dissectors/packet-homeplug.c +++ b/epan/dissectors/packet-homeplug.c @@ -25,8 +25,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-hp-erm.c b/epan/dissectors/packet-hp-erm.c index 62e26f9a38..6ff3df0a12 100644 --- a/epan/dissectors/packet-hp-erm.c +++ b/epan/dissectors/packet-hp-erm.c @@ -45,7 +45,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-hpext.c b/epan/dissectors/packet-hpext.c index 3b16c83453..76c276a11d 100644 --- a/epan/dissectors/packet-hpext.c +++ b/epan/dissectors/packet-hpext.c @@ -25,7 +25,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/xdlc.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-hpsw.c b/epan/dissectors/packet-hpsw.c index 04a4a89850..e8fea341a0 100644 --- a/epan/dissectors/packet-hpsw.c +++ b/epan/dissectors/packet-hpsw.c @@ -23,7 +23,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/etypes.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-hpteam.c b/epan/dissectors/packet-hpteam.c index a39aaf644e..7537b50724 100644 --- a/epan/dissectors/packet-hpteam.c +++ b/epan/dissectors/packet-hpteam.c @@ -24,12 +24,10 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/to_str.h> #include <epan/oui.h> -#include <packet-llc.h> +#include "packet-llc.h" void proto_register_hpteam(void); void proto_reg_handoff_hpteam(void); diff --git a/epan/dissectors/packet-hsr-prp-supervision.c b/epan/dissectors/packet-hsr-prp-supervision.c index 348a791fde..c495cbcaa9 100644 --- a/epan/dissectors/packet-hsr-prp-supervision.c +++ b/epan/dissectors/packet-hsr-prp-supervision.c @@ -24,7 +24,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-hsr.c b/epan/dissectors/packet-hsr.c index 952b775ce4..660e97d924 100644 --- a/epan/dissectors/packet-hsr.c +++ b/epan/dissectors/packet-hsr.c @@ -23,7 +23,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-hsrp.c b/epan/dissectors/packet-hsrp.c index c63c0580ec..8adf3ba6dc 100644 --- a/epan/dissectors/packet-hsrp.c +++ b/epan/dissectors/packet-hsrp.c @@ -135,7 +135,6 @@ #include "config.h" #include <string.h> -#include <glib.h> #include <epan/packet.h> #include <epan/to_str.h> diff --git a/epan/dissectors/packet-http-urlencoded.c b/epan/dissectors/packet-http-urlencoded.c index 0838f79a6d..f8e2c659da 100644 --- a/epan/dissectors/packet-http-urlencoded.c +++ b/epan/dissectors/packet-http-urlencoded.c @@ -24,10 +24,7 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include <wsutil/str_util.h> void proto_register_http_urlencoded(void); diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index ebb8e0e306..6246efaad6 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -34,22 +34,19 @@ #include <string.h> #include <errno.h> -#include <glib.h> -#include <epan/conversation.h> #include <epan/packet.h> +#include <epan/prefs.h> +#include <epan/expert.h> +#include <epan/uat.h> +#include <epan/conversation.h> #include <epan/strutil.h> -#include <wsutil/base64.h> #include <epan/stats_tree.h> #include <epan/to_str.h> - #include <epan/req_resp_hdrs.h> +#include <wsutil/base64.h> #include "packet-http.h" #include "packet-tcp.h" #include "packet-ssl.h" -#include <epan/prefs.h> -#include <epan/expert.h> -#include <epan/uat.h> -#include <epan/wmem/wmem.h> typedef enum _http_type { HTTP_REQUEST, diff --git a/epan/dissectors/packet-http2.c b/epan/dissectors/packet-http2.c index 2fbd1f086a..5396acf2cb 100644 --- a/epan/dissectors/packet-http2.c +++ b/epan/dissectors/packet-http2.c @@ -40,8 +40,6 @@ #include <stdio.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-hyperscsi.c b/epan/dissectors/packet-hyperscsi.c index fc8bfdd731..592ebcead8 100644 --- a/epan/dissectors/packet-hyperscsi.c +++ b/epan/dissectors/packet-hyperscsi.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> void proto_register_hyperscsi(void); diff --git a/epan/dissectors/packet-i2c.c b/epan/dissectors/packet-i2c.c index 401f11d03c..704ae080fd 100644 --- a/epan/dissectors/packet-i2c.c +++ b/epan/dissectors/packet-i2c.c @@ -24,8 +24,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <wiretap/wtap.h> diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c index 83ae890759..63eee63952 100644 --- a/epan/dissectors/packet-iax2.c +++ b/epan/dissectors/packet-iax2.c @@ -32,13 +32,10 @@ #include <string.h> -#include <glib.h> - -#include <epan/circuit.h> #include <epan/packet.h> +#include <epan/circuit.h> #include <epan/exceptions.h> #include <epan/to_str.h> -#include <epan/wmem/wmem.h> #include <epan/reassemble.h> #include <epan/expert.h> #include <epan/aftypes.h> diff --git a/epan/dissectors/packet-icap.c b/epan/dissectors/packet-icap.c index b3367cb8f2..ef034380c5 100644 --- a/epan/dissectors/packet-icap.c +++ b/epan/dissectors/packet-icap.c @@ -27,7 +27,6 @@ #include <string.h> -#include <glib.h> #include <epan/packet.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-icep.c b/epan/dissectors/packet-icep.c index 3c92febad1..ba0dca1b8b 100644 --- a/epan/dissectors/packet-icep.c +++ b/epan/dissectors/packet-icep.c @@ -38,12 +38,9 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> #include "packet-tcp.h" void proto_register_icep(void); diff --git a/epan/dissectors/packet-icmp.c b/epan/dissectors/packet-icmp.c index 6e0e5bebc9..8565d1c342 100644 --- a/epan/dissectors/packet-icmp.c +++ b/epan/dissectors/packet-icmp.c @@ -33,22 +33,19 @@ #include "config.h" #include <stdlib.h> - -#include <glib.h> #include <time.h> #include <epan/packet.h> -#include <epan/ipproto.h> #include <epan/prefs.h> #include <epan/expert.h> #include <epan/in_cksum.h> #include <epan/to_str.h> +#include <epan/conversation.h> +#include <epan/tap.h> +#include <epan/ipproto.h> #include "packet-ip.h" #include "packet-icmp.h" -#include <epan/conversation.h> -#include <epan/wmem/wmem.h> -#include <epan/tap.h> void proto_register_icmp(void); void proto_reg_handoff_icmp(void); diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c index 2c23018979..83d2764697 100644 --- a/epan/dissectors/packet-icmpv6.c +++ b/epan/dissectors/packet-icmpv6.c @@ -33,8 +33,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/in_cksum.h> #include <epan/addr_resolv.h> @@ -43,7 +41,6 @@ #include <epan/strutil.h> #include <epan/expert.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> #include <epan/tap.h> #include "packet-ber.h" diff --git a/epan/dissectors/packet-icp.c b/epan/dissectors/packet-icp.c index a4345519e1..3d0cdf7063 100644 --- a/epan/dissectors/packet-icp.c +++ b/epan/dissectors/packet-icp.c @@ -25,8 +25,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-icq.c b/epan/dissectors/packet-icq.c index 00b63897ec..00ed88a223 100644 --- a/epan/dissectors/packet-icq.c +++ b/epan/dissectors/packet-icq.c @@ -29,8 +29,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/to_str.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-idp.c b/epan/dissectors/packet-idp.c index 9029119e1e..fe53f7654f 100644 --- a/epan/dissectors/packet-idp.c +++ b/epan/dissectors/packet-idp.c @@ -23,7 +23,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-idp.h" #include <epan/etypes.h> diff --git a/epan/dissectors/packet-idrp.c b/epan/dissectors/packet-idrp.c index d7819bfed7..c8f8d5d2c5 100644 --- a/epan/dissectors/packet-idrp.c +++ b/epan/dissectors/packet-idrp.c @@ -30,13 +30,12 @@ #include "config.h" -#include <glib.h> +#include <math.h> + #include <epan/packet.h> #include <epan/expert.h> #include <epan/nlpid.h> -#include <math.h> - #define IDRP_PROTO "ISO/IEC 10747 (1993): Inter Domain Routing Protocol " void proto_register_idrp(void); diff --git a/epan/dissectors/packet-iec104.c b/epan/dissectors/packet-iec104.c index 85d8fa6de2..2e8fedfce7 100644 --- a/epan/dissectors/packet-iec104.c +++ b/epan/dissectors/packet-iec104.c @@ -31,14 +31,12 @@ #include "config.h" #include <string.h> -#include <glib.h> #include <math.h> /* floor */ #include <epan/packet.h> #include <epan/expert.h> #include <epan/strutil.h> -#include <epan/dissectors/packet-tcp.h> -#include <epan/wmem/wmem.h> +#include "packet-tcp.h" void proto_register_iec104apci(void); void proto_register_iec104asdu(void); diff --git a/epan/dissectors/packet-ieee80211-netmon.c b/epan/dissectors/packet-ieee80211-netmon.c index 2e3b5dbb07..27a188ff08 100644 --- a/epan/dissectors/packet-ieee80211-netmon.c +++ b/epan/dissectors/packet-ieee80211-netmon.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <wiretap/wtap.h> diff --git a/epan/dissectors/packet-ieee80211-prism.c b/epan/dissectors/packet-ieee80211-prism.c index c88ca1aaec..e8c772008a 100644 --- a/epan/dissectors/packet-ieee80211-prism.c +++ b/epan/dissectors/packet-ieee80211-prism.c @@ -27,8 +27,6 @@ #include <epan/packet.h> #include <wiretap/wtap.h> #include <wsutil/pint.h> -#include <epan/wmem/wmem.h> - #include "packet-ieee80211.h" void proto_register_ieee80211_prism(void); diff --git a/epan/dissectors/packet-ieee80211-radiotap-iter.c b/epan/dissectors/packet-ieee80211-radiotap-iter.c index fbe8a14e88..e8394cb55b 100644 --- a/epan/dissectors/packet-ieee80211-radiotap-iter.c +++ b/epan/dissectors/packet-ieee80211-radiotap-iter.c @@ -28,7 +28,8 @@ #include <stddef.h> #include <errno.h> -#include <glib.h> + +#include <epan/packet.h> #include <wsutil/pint.h> #define le16_to_cpu GINT16_FROM_LE diff --git a/epan/dissectors/packet-ieee80211-radiotap.c b/epan/dissectors/packet-ieee80211-radiotap.c index fcee5fd4de..9c83211573 100644 --- a/epan/dissectors/packet-ieee80211-radiotap.c +++ b/epan/dissectors/packet-ieee80211-radiotap.c @@ -25,7 +25,6 @@ #include "config.h" -#include <glib.h> #include <errno.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 57d3e0f07a..4799a05dec 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -81,8 +81,6 @@ #include <string.h> #include <math.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <wsutil/pint.h> @@ -99,7 +97,6 @@ #include <wsutil/crc32.h> #include <epan/crc32-tvb.h> #include <epan/tap.h> -#include <epan/wmem/wmem.h> #include <epan/crypt/wep-wpadefs.h> #include <epan/expert.h> #include <epan/conversation_table.h> diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c index c10519aa50..041cfe466e 100644 --- a/epan/dissectors/packet-ieee802154.c +++ b/epan/dissectors/packet-ieee802154.c @@ -61,13 +61,9 @@ #include <string.h> -#include <glib.h> - -#include <epan/wmem/wmem.h> -#include <epan/decode_as.h> #include <epan/packet.h> +#include <epan/decode_as.h> #include <epan/exceptions.h> -#include <wsutil/pint.h> #include <epan/crc16-tvb.h> #include <epan/expert.h> #include <epan/addr_resolv.h> @@ -75,6 +71,7 @@ #include <epan/uat.h> #include <epan/strutil.h> #include <epan/show_exception.h> +#include <wsutil/pint.h> /* Use libgcrypt for cipher libraries. */ #ifdef HAVE_LIBGCRYPT diff --git a/epan/dissectors/packet-ieee8021ah.c b/epan/dissectors/packet-ieee8021ah.c index 1c96513e9c..4f2a670cad 100644 --- a/epan/dissectors/packet-ieee8021ah.c +++ b/epan/dissectors/packet-ieee8021ah.c @@ -22,7 +22,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <wsutil/pint.h> #include <epan/addr_resolv.h> diff --git a/epan/dissectors/packet-ieee8023.c b/epan/dissectors/packet-ieee8023.c index 78e1696393..da4a9dfcbb 100644 --- a/epan/dissectors/packet-ieee8023.c +++ b/epan/dissectors/packet-ieee8023.c @@ -22,7 +22,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-ieee802a.c b/epan/dissectors/packet-ieee802a.c index ffb1cf64d7..25c8d1199a 100644 --- a/epan/dissectors/packet-ieee802a.c +++ b/epan/dissectors/packet-ieee802a.c @@ -22,7 +22,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/addr_resolv.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-ifcp.c b/epan/dissectors/packet-ifcp.c index 31248a2c10..8682a994c3 100644 --- a/epan/dissectors/packet-ifcp.c +++ b/epan/dissectors/packet-ifcp.c @@ -30,8 +30,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/conversation.h> diff --git a/epan/dissectors/packet-igap.c b/epan/dissectors/packet-igap.c index 1b9c8ffc00..eb303e10fc 100644 --- a/epan/dissectors/packet-igap.c +++ b/epan/dissectors/packet-igap.c @@ -42,7 +42,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/to_str.h> #include "packet-igmp.h" diff --git a/epan/dissectors/packet-igmp.c b/epan/dissectors/packet-igmp.c index 756d3a5536..15c3f91082 100644 --- a/epan/dissectors/packet-igmp.c +++ b/epan/dissectors/packet-igmp.c @@ -109,8 +109,6 @@ #include "config.h" #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/range.h> #include <epan/to_str.h> diff --git a/epan/dissectors/packet-igrp.c b/epan/dissectors/packet-igrp.c index f158de5178..11e6a64b0d 100644 --- a/epan/dissectors/packet-igrp.c +++ b/epan/dissectors/packet-igrp.c @@ -29,8 +29,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include <epan/to_str.h> diff --git a/epan/dissectors/packet-imap.c b/epan/dissectors/packet-imap.c index 596609cb9b..fb188a6a47 100644 --- a/epan/dissectors/packet-imap.c +++ b/epan/dissectors/packet-imap.c @@ -25,13 +25,12 @@ #include "config.h" +#include <stdio.h> + #include <epan/packet.h> #include <epan/strutil.h> -#include <epan/wmem/wmem.h> #include "packet-ssl.h" -#include <stdio.h> - void proto_register_imap(void); void proto_reg_handoff_imap(void); diff --git a/epan/dissectors/packet-imf.c b/epan/dissectors/packet-imf.c index ae2fe7f8ad..685bb92d80 100644 --- a/epan/dissectors/packet-imf.c +++ b/epan/dissectors/packet-imf.c @@ -29,8 +29,6 @@ #include <epan/prefs.h> #include <epan/uat.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> - #include <wsutil/str_util.h> #include "packet-ber.h" diff --git a/epan/dissectors/packet-infiniband.c b/epan/dissectors/packet-infiniband.c index df7f636a50..4c3dc3d991 100644 --- a/epan/dissectors/packet-infiniband.c +++ b/epan/dissectors/packet-infiniband.c @@ -27,11 +27,8 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> -#include <epan/wmem/wmem.h> #include <epan/conversation.h> #include <epan/prefs.h> #include <wiretap/wtap.h> diff --git a/epan/dissectors/packet-infiniband_sdp.c b/epan/dissectors/packet-infiniband_sdp.c index f847102db4..bd46bc3a0f 100644 --- a/epan/dissectors/packet-infiniband_sdp.c +++ b/epan/dissectors/packet-infiniband_sdp.c @@ -24,15 +24,13 @@ #include "config.h" -#include <glib.h> +#include <stdlib.h> +#include <errno.h> #include <epan/packet.h> #include <epan/prefs.h> #include <epan/addr_resolv.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> -#include <stdlib.h> -#include <errno.h> #include "packet-infiniband.h" diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index 50933d5d94..8cf4a626d4 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -28,8 +28,6 @@ #include "config.h" #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/addr_resolv.h> #include <epan/ipproto.h> @@ -49,7 +47,6 @@ #include <epan/nlpid.h> #include <epan/ax25_pids.h> #include <epan/tap.h> -#include <epan/wmem/wmem.h> #include <epan/decode_as.h> #include <wiretap/erf.h> diff --git a/epan/dissectors/packet-ipars.c b/epan/dissectors/packet-ipars.c index 4de1f45ad6..15ae0c6bb5 100644 --- a/epan/dissectors/packet-ipars.c +++ b/epan/dissectors/packet-ipars.c @@ -27,10 +27,7 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> -#include <epan/wmem/wmem.h> - void proto_register_ipars(void); static int proto_ipars = -1; diff --git a/epan/dissectors/packet-ipdc.c b/epan/dissectors/packet-ipdc.c index 85cec8b165..3a911e587c 100644 --- a/epan/dissectors/packet-ipdc.c +++ b/epan/dissectors/packet-ipdc.c @@ -38,7 +38,6 @@ #include "config.h" -#include <glib.h> #include <math.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-ipfc.c b/epan/dissectors/packet-ipfc.c index 21b8757cbe..9512c26c2f 100644 --- a/epan/dissectors/packet-ipfc.c +++ b/epan/dissectors/packet-ipfc.c @@ -26,8 +26,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <wiretap/wtap.h> #include <epan/to_str.h> diff --git a/epan/dissectors/packet-ipmi-session.c b/epan/dissectors/packet-ipmi-session.c index b3d24690ad..d3b00f430d 100644 --- a/epan/dissectors/packet-ipmi-session.c +++ b/epan/dissectors/packet-ipmi-session.c @@ -26,7 +26,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> void proto_register_ipmi_session(void); diff --git a/epan/dissectors/packet-ipmi-trace.c b/epan/dissectors/packet-ipmi-trace.c index e490f7961d..a4853932e3 100644 --- a/epan/dissectors/packet-ipmi-trace.c +++ b/epan/dissectors/packet-ipmi-trace.c @@ -24,11 +24,9 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <epan/dissectors/packet-ipmi.h> #include <wiretap/wtap.h> +#include "packet-ipmi.h" /* * See diff --git a/epan/dissectors/packet-ipmi.c b/epan/dissectors/packet-ipmi.c index 5534940c67..cf53d3cf9c 100644 --- a/epan/dissectors/packet-ipmi.c +++ b/epan/dissectors/packet-ipmi.c @@ -29,7 +29,6 @@ #include <epan/packet.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> #include <epan/to_str.h> #include <epan/prefs.h> #include <epan/addr_resolv.h> diff --git a/epan/dissectors/packet-ipnet.c b/epan/dissectors/packet-ipnet.c index dc992d7e1b..dbf030842d 100644 --- a/epan/dissectors/packet-ipnet.c +++ b/epan/dissectors/packet-ipnet.c @@ -22,10 +22,8 @@ #include "config.h" -#include <glib.h> - -#include <epan/aftypes.h> #include <epan/packet.h> +#include <epan/aftypes.h> #include <wiretap/wtap.h> void proto_register_ipnet(void); diff --git a/epan/dissectors/packet-ipoib.c b/epan/dissectors/packet-ipoib.c index 5f9c5fdcf6..8604a357cb 100644 --- a/epan/dissectors/packet-ipoib.c +++ b/epan/dissectors/packet-ipoib.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/etypes.h> #include <wiretap/wtap.h> diff --git a/epan/dissectors/packet-ipp.c b/epan/dissectors/packet-ipp.c index a8e53f6e0c..6bd00882d8 100644 --- a/epan/dissectors/packet-ipp.c +++ b/epan/dissectors/packet-ipp.c @@ -26,7 +26,6 @@ #include <string.h> -#include <glib.h> #include <epan/packet.h> #include <epan/strutil.h> #include <epan/to_str.h> diff --git a/epan/dissectors/packet-ipsec-tcp.c b/epan/dissectors/packet-ipsec-tcp.c index b50db424d3..579891f904 100644 --- a/epan/dissectors/packet-ipsec-tcp.c +++ b/epan/dissectors/packet-ipsec-tcp.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> #include "packet-ndmp.h" diff --git a/epan/dissectors/packet-ipsec-udp.c b/epan/dissectors/packet-ipsec-udp.c index 6c9dd7bce7..248bb67d7a 100644 --- a/epan/dissectors/packet-ipsec-udp.c +++ b/epan/dissectors/packet-ipsec-udp.c @@ -24,7 +24,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> void proto_register_udpencap(void); diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c index 3cdfb16ccd..6a99bc2605 100644 --- a/epan/dissectors/packet-ipsec.c +++ b/epan/dissectors/packet-ipsec.c @@ -71,10 +71,7 @@ ADD: Additional generic (non-checked) ICV length of 128, 192 and 256. #include <string.h> -#include <glib.h> - #include <epan/packet.h> -#include <epan/emem.h> #include <epan/addr_resolv.h> #include <epan/ipproto.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-ipsi-ctl.c b/epan/dissectors/packet-ipsi-ctl.c index 2816db5b9c..3608106a29 100644 --- a/epan/dissectors/packet-ipsi-ctl.c +++ b/epan/dissectors/packet-ipsi-ctl.c @@ -26,7 +26,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> void proto_register_ipsictl(void); diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index 6129a61077..7b5a43102e 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -27,7 +27,6 @@ #include "config.h" #include <math.h> -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include <epan/ip_opts.h> @@ -45,7 +44,6 @@ #include <epan/arcnet_pids.h> #include <epan/in_cksum.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> #include <epan/decode_as.h> #include <epan/tap.h> #include <wiretap/erf.h> diff --git a/epan/dissectors/packet-ipvs-syncd.c b/epan/dissectors/packet-ipvs-syncd.c index c61988becd..708649be0d 100644 --- a/epan/dissectors/packet-ipvs-syncd.c +++ b/epan/dissectors/packet-ipvs-syncd.c @@ -22,8 +22,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/ipproto.h> diff --git a/epan/dissectors/packet-ipx.c b/epan/dissectors/packet-ipx.c index e3996c923b..14b57b1d2e 100644 --- a/epan/dissectors/packet-ipx.c +++ b/epan/dissectors/packet-ipx.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-ipx.h" #include "packet-sll.h" @@ -40,8 +39,6 @@ #include <epan/conversation.h> #include <epan/conversation_table.h> #include <epan/tap.h> -#include <epan/wmem/wmem.h> - void proto_register_ipx(void); void proto_reg_handoff_ipx(void); diff --git a/epan/dissectors/packet-ipxwan.c b/epan/dissectors/packet-ipxwan.c index 64cddce0de..0af70c0f63 100644 --- a/epan/dissectors/packet-ipxwan.c +++ b/epan/dissectors/packet-ipxwan.c @@ -22,7 +22,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include "packet-ipx.h" diff --git a/epan/dissectors/packet-irc.c b/epan/dissectors/packet-irc.c index c2431ddfbf..257796daba 100644 --- a/epan/dissectors/packet-irc.c +++ b/epan/dissectors/packet-irc.c @@ -40,7 +40,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index f2252ed1da..6a2c3d26f4 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -43,19 +43,16 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include <epan/ipproto.h> #include <epan/asn1.h> #include <epan/reassemble.h> -#include <epan/dissectors/packet-x509if.h> -#include <epan/dissectors/packet-x509af.h> -#include <epan/dissectors/packet-isakmp.h> #include <epan/prefs.h> #include <epan/expert.h> #include <epan/to_str.h> +#include "packet-x509if.h" +#include "packet-x509af.h" +#include "packet-isakmp.h" #ifdef HAVE_LIBGCRYPT #include <wsutil/wsgcrypt.h> diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c index e44f8ad024..38b0b5fe7e 100644 --- a/epan/dissectors/packet-iscsi.c +++ b/epan/dissectors/packet-iscsi.c @@ -36,13 +36,10 @@ #include <stdlib.h> #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/conversation.h> #include "packet-scsi.h" -#include <epan/wmem/wmem.h> #include <epan/range.h> #include <epan/crc32-tvb.h> #include <wsutil/crc32.h> diff --git a/epan/dissectors/packet-isdn.c b/epan/dissectors/packet-isdn.c index a8f05c8279..fc27c8978e 100644 --- a/epan/dissectors/packet-isdn.c +++ b/epan/dissectors/packet-isdn.c @@ -22,8 +22,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <wiretap/wtap.h> diff --git a/epan/dissectors/packet-iser.c b/epan/dissectors/packet-iser.c index d5e4149d1b..9f8f4b70d7 100644 --- a/epan/dissectors/packet-iser.c +++ b/epan/dissectors/packet-iser.c @@ -24,12 +24,13 @@ #include "config.h" +#include <stdlib.h> +#include <errno.h> + #include <epan/packet.h> #include <epan/prefs.h> #include <epan/conversation.h> #include <epan/addr_resolv.h> -#include <stdlib.h> -#include <errno.h> #include "packet-infiniband.h" diff --git a/epan/dissectors/packet-isis-clv.c b/epan/dissectors/packet-isis-clv.c index ab2eb43e11..cfa347a3df 100644 --- a/epan/dissectors/packet-isis-clv.c +++ b/epan/dissectors/packet-isis-clv.c @@ -24,8 +24,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include "packet-osi.h" diff --git a/epan/dissectors/packet-isis-hello.c b/epan/dissectors/packet-isis-hello.c index d732010517..75f515e0a1 100644 --- a/epan/dissectors/packet-isis-hello.c +++ b/epan/dissectors/packet-isis-hello.c @@ -24,7 +24,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include "packet-osi.h" diff --git a/epan/dissectors/packet-isis-lsp.c b/epan/dissectors/packet-isis-lsp.c index db9c2bd0f7..7f9cfdda6e 100644 --- a/epan/dissectors/packet-isis-lsp.c +++ b/epan/dissectors/packet-isis-lsp.c @@ -30,8 +30,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include "packet-osi.h" diff --git a/epan/dissectors/packet-isis-snp.c b/epan/dissectors/packet-isis-snp.c index 648316065e..0a30502e2f 100644 --- a/epan/dissectors/packet-isis-snp.c +++ b/epan/dissectors/packet-isis-snp.c @@ -24,7 +24,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include "packet-osi.h" diff --git a/epan/dissectors/packet-isis.c b/epan/dissectors/packet-isis.c index 07caa7de8d..43e92ead7d 100644 --- a/epan/dissectors/packet-isis.c +++ b/epan/dissectors/packet-isis.c @@ -25,7 +25,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include <epan/nlpid.h> diff --git a/epan/dissectors/packet-isl.c b/epan/dissectors/packet-isl.c index 1ab900934d..cf33c33678 100644 --- a/epan/dissectors/packet-isl.c +++ b/epan/dissectors/packet-isl.c @@ -22,8 +22,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-ismacryp.c b/epan/dissectors/packet-ismacryp.c index 009a936d42..927ce5f435 100644 --- a/epan/dissectors/packet-ismacryp.c +++ b/epan/dissectors/packet-ismacryp.c @@ -30,7 +30,6 @@ */ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-ismp.c b/epan/dissectors/packet-ismp.c index cc48b57ed7..0850114152 100644 --- a/epan/dissectors/packet-ismp.c +++ b/epan/dissectors/packet-ismp.c @@ -24,8 +24,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include <epan/to_str.h> diff --git a/epan/dissectors/packet-isns.c b/epan/dissectors/packet-isns.c index b2b2110e9c..ca854e9f01 100644 --- a/epan/dissectors/packet-isns.c +++ b/epan/dissectors/packet-isns.c @@ -29,8 +29,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include <epan/exceptions.h> diff --git a/epan/dissectors/packet-iso7816.c b/epan/dissectors/packet-iso7816.c index afd89d5471..0acc42a33d 100644 --- a/epan/dissectors/packet-iso7816.c +++ b/epan/dissectors/packet-iso7816.c @@ -32,12 +32,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> - void proto_register_iso7816(void); void proto_reg_handoff_iso7816(void); diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index 0f2ff8535c..137f3e06f5 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -50,18 +50,17 @@ #include <epan/exceptions.h> #include <epan/stats_tree.h> #include <epan/asn1.h> +#include <epan/prefs.h> +#include <epan/sctpppids.h> +#include <epan/circuit.h> +#include <epan/reassemble.h> +#include <epan/to_str.h> #include <wsutil/str_util.h> -#include <prefs.h> #include "packet-q931.h" #include "packet-isup.h" #include "packet-e164.h" #include "packet-charging_ase.h" -#include <epan/sctpppids.h> -#include <epan/wmem/wmem.h> -#include <epan/circuit.h> -#include <epan/reassemble.h> -#include <epan/to_str.h> -#include <packet-mtp3.h> +#include "packet-mtp3.h" void proto_register_isup(void); void proto_reg_handoff_isup(void); diff --git a/epan/dissectors/packet-itdm.c b/epan/dissectors/packet-itdm.c index afb2224041..576872d5c4 100644 --- a/epan/dissectors/packet-itdm.c +++ b/epan/dissectors/packet-itdm.c @@ -25,7 +25,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-iuup.c b/epan/dissectors/packet-iuup.c index b9ea09aa84..9f8e0b8ce7 100644 --- a/epan/dissectors/packet-iuup.c +++ b/epan/dissectors/packet-iuup.c @@ -31,10 +31,8 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> #include <epan/expert.h> #include <epan/crc10-tvb.h> #include <wsutil/crc10.h> diff --git a/epan/dissectors/packet-iwarp-ddp-rdmap.c b/epan/dissectors/packet-iwarp-ddp-rdmap.c index 60c411e9a6..a18ef4044f 100644 --- a/epan/dissectors/packet-iwarp-ddp-rdmap.c +++ b/epan/dissectors/packet-iwarp-ddp-rdmap.c @@ -28,8 +28,6 @@ /* INCLUDES */ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include "packet-iwarp-ddp-rdmap.h" diff --git a/epan/dissectors/packet-iwarp-mpa.c b/epan/dissectors/packet-iwarp-mpa.c index 51388035a5..75dfe29a54 100644 --- a/epan/dissectors/packet-iwarp-mpa.c +++ b/epan/dissectors/packet-iwarp-mpa.c @@ -28,12 +28,11 @@ #include "config.h" #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include <epan/conversation.h> -#include <epan/dissectors/packet-tcp.h> #include <epan/expert.h> #include <epan/crc32-tvb.h> #include <wsutil/crc32.h> +#include "packet-tcp.h" void proto_register_mpa(void); void proto_reg_handoff_mpa(void); diff --git a/epan/dissectors/packet-ixveriwave.c b/epan/dissectors/packet-ixveriwave.c index b393f5734e..cb546a1a6c 100644 --- a/epan/dissectors/packet-ixveriwave.c +++ b/epan/dissectors/packet-ixveriwave.c @@ -24,13 +24,9 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <wiretap/wtap.h> #include <epan/crc32-tvb.h> -#include <epan/wmem/wmem.h> - #include "packet-eth.h" void proto_register_ixveriwave(void); diff --git a/epan/dissectors/packet-j1939.c b/epan/dissectors/packet-j1939.c index ee3c196536..31878c5581 100644 --- a/epan/dissectors/packet-j1939.c +++ b/epan/dissectors/packet-j1939.c @@ -24,7 +24,6 @@ */ #include "config.h" -#include <glib.h> #include <epan/packet.h> void proto_register_j1939(void); diff --git a/epan/dissectors/packet-jpeg.c b/epan/dissectors/packet-jpeg.c index 3612d42349..a3752e4c2c 100644 --- a/epan/dissectors/packet-jpeg.c +++ b/epan/dissectors/packet-jpeg.c @@ -30,7 +30,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/rtp_pt.h> diff --git a/epan/dissectors/packet-json.c b/epan/dissectors/packet-json.c index 7572232c7d..914a90f8b6 100644 --- a/epan/dissectors/packet-json.c +++ b/epan/dissectors/packet-json.c @@ -29,9 +29,6 @@ #include "config.h" -#include <glib.h> - -#include <epan/wmem/wmem.h> #include <epan/packet.h> #include <epan/tvbparse.h> diff --git a/epan/dissectors/packet-juniper.c b/epan/dissectors/packet-juniper.c index 1749ecfff8..c78dcb352d 100644 --- a/epan/dissectors/packet-juniper.c +++ b/epan/dissectors/packet-juniper.c @@ -23,7 +23,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c index c0ba8e66c1..3b85bb151c 100644 --- a/epan/dissectors/packet-jxta.c +++ b/epan/dissectors/packet-jxta.c @@ -33,18 +33,14 @@ #define G_LOG_DOMAIN "jxta" -#include <glib.h> - -#include <wsutil/str_util.h> - #include <epan/packet.h> #include <epan/conversation.h> #include <epan/conversation_table.h> #include <epan/strutil.h> #include <epan/prefs.h> #include <epan/tap.h> -#include <epan/wmem/wmem.h> #include <epan/to_str.h> +#include <wsutil/str_util.h> #include "packet-jxta.h" diff --git a/epan/dissectors/packet-k12.c b/epan/dissectors/packet-k12.c index adfd433ae4..8c63375668 100644 --- a/epan/dissectors/packet-k12.c +++ b/epan/dissectors/packet-k12.c @@ -23,20 +23,18 @@ */ #include "config.h" -#include <errno.h> -#include <glib.h> #include <string.h> -#include <wsutil/str_util.h> +#include <errno.h> + #include <epan/packet.h> -#include <wsutil/pint.h> #include <epan/conversation.h> -#include <prefs.h> -#include <wiretap/wtap.h> -#include <epan/emem.h> -#include <epan/wmem/wmem.h> +#include <epan/prefs.h> #include <epan/uat.h> #include <epan/expert.h> #include <epan/strutil.h> +#include <wiretap/wtap.h> +#include <wsutil/pint.h> +#include <wsutil/str_util.h> #include "packet-sscop.h" #include "packet-umts_fp.h" diff --git a/epan/dissectors/packet-kafka.c b/epan/dissectors/packet-kafka.c index e212e54a84..30b475b099 100644 --- a/epan/dissectors/packet-kafka.c +++ b/epan/dissectors/packet-kafka.c @@ -25,14 +25,11 @@ #include "config.h" -#include <glib.h> - -#include <epan/dissectors/packet-tcp.h> -#include <epan/conversation.h> #include <epan/packet.h> +#include <epan/conversation.h> #include <epan/expert.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> +#include "packet-tcp.h" void proto_register_kafka(void); void proto_reg_handoff_kafka(void); diff --git a/epan/dissectors/packet-kdp.c b/epan/dissectors/packet-kdp.c index f6b9fcfe38..c107c973d1 100644 --- a/epan/dissectors/packet-kdp.c +++ b/epan/dissectors/packet-kdp.c @@ -26,8 +26,6 @@ #include "config.h" #include <epan/packet.h> -#include <glib.h> - void proto_register_kdp(void); void proto_reg_handoff_kdp(void); diff --git a/epan/dissectors/packet-kdsp.c b/epan/dissectors/packet-kdsp.c index c8fc6605ef..cb6562afc4 100644 --- a/epan/dissectors/packet-kdsp.c +++ b/epan/dissectors/packet-kdsp.c @@ -24,7 +24,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-kerberos4.c b/epan/dissectors/packet-kerberos4.c index c62c9d0cf9..4dd26095db 100644 --- a/epan/dissectors/packet-kerberos4.c +++ b/epan/dissectors/packet-kerberos4.c @@ -33,7 +33,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> void proto_register_krb4(void); diff --git a/epan/dissectors/packet-kingfisher.c b/epan/dissectors/packet-kingfisher.c index 30e0a3992e..83139f8400 100644 --- a/epan/dissectors/packet-kingfisher.c +++ b/epan/dissectors/packet-kingfisher.c @@ -26,7 +26,6 @@ #include "config.h" #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include <epan/conversation.h> void proto_register_kingfisher(void); diff --git a/epan/dissectors/packet-kink.c b/epan/dissectors/packet-kink.c index 25a7c2f05d..76cbfee86d 100644 --- a/epan/dissectors/packet-kink.c +++ b/epan/dissectors/packet-kink.c @@ -26,7 +26,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include <epan/asn1.h> diff --git a/epan/dissectors/packet-kismet.c b/epan/dissectors/packet-kismet.c index bd171583d2..6a60cff12b 100644 --- a/epan/dissectors/packet-kismet.c +++ b/epan/dissectors/packet-kismet.c @@ -27,7 +27,6 @@ #include <stdlib.h> #include <string.h> -#include <glib.h> #include <epan/packet.h> #include <epan/to_str.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-knet.c b/epan/dissectors/packet-knet.c index 2a2c19998b..4a0655181e 100644 --- a/epan/dissectors/packet-knet.c +++ b/epan/dissectors/packet-knet.c @@ -26,8 +26,7 @@ #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> -#include <epan/dissectors/packet-tcp.h> +#include "packet-tcp.h" void proto_register_knet(void); void proto_reg_handoff_knet(void); diff --git a/epan/dissectors/packet-knxnetip.c b/epan/dissectors/packet-knxnetip.c index 4e6ea980ff..77c78821ac 100644 --- a/epan/dissectors/packet-knxnetip.c +++ b/epan/dissectors/packet-knxnetip.c @@ -22,7 +22,6 @@ */ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-kt.c b/epan/dissectors/packet-kt.c index dbd33bb5be..9cc2dad515 100644 --- a/epan/dissectors/packet-kt.c +++ b/epan/dissectors/packet-kt.c @@ -29,7 +29,6 @@ #include "config.h" -#include <glib.h> #include <time.h> #include <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-l1-events.c b/epan/dissectors/packet-l1-events.c index 49d5709496..33588023a9 100644 --- a/epan/dissectors/packet-l1-events.c +++ b/epan/dissectors/packet-l1-events.c @@ -29,8 +29,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <wiretap/wtap.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c index 0d9d42af3b..aa4c0cb72c 100644 --- a/epan/dissectors/packet-l2tp.c +++ b/epan/dissectors/packet-l2tp.c @@ -54,11 +54,6 @@ #include "config.h" -#include <glib.h> - -#include <wsutil/md5.h> -#include <wsutil/sha1.h> - #include <epan/packet.h> #include <epan/addr_resolv.h> #include <epan/ipproto.h> @@ -66,8 +61,8 @@ #include <epan/prefs.h> #include <epan/conversation.h> #include <epan/expert.h> -#include <epan/proto.h> -#include <epan/wmem/wmem.h> +#include <wsutil/md5.h> +#include <wsutil/sha1.h> #include "packet-l2tp.h" diff --git a/epan/dissectors/packet-lanforge.c b/epan/dissectors/packet-lanforge.c index bacbc3e6aa..56f405a05e 100644 --- a/epan/dissectors/packet-lanforge.c +++ b/epan/dissectors/packet-lanforge.c @@ -31,8 +31,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> void proto_register_lanforge(void); diff --git a/epan/dissectors/packet-lapb.c b/epan/dissectors/packet-lapb.c index e1f6388017..8dd9d1e187 100644 --- a/epan/dissectors/packet-lapb.c +++ b/epan/dissectors/packet-lapb.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <wiretap/wtap.h> #include <epan/xdlc.h> diff --git a/epan/dissectors/packet-lapbether.c b/epan/dissectors/packet-lapbether.c index 766435e049..1388481001 100644 --- a/epan/dissectors/packet-lapbether.c +++ b/epan/dissectors/packet-lapbether.c @@ -24,7 +24,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-lapd.c b/epan/dissectors/packet-lapd.c index 6de2aa410c..e0ddaea22e 100644 --- a/epan/dissectors/packet-lapd.c +++ b/epan/dissectors/packet-lapd.c @@ -37,7 +37,6 @@ #include "config.h" -#include <glib.h> #include <string.h> #include <epan/packet.h> #include <epan/conversation.h> @@ -47,8 +46,6 @@ #include <wiretap/wtap.h> #include <epan/lapd_sapi.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> - void proto_register_lapd(void); static int proto_lapd = -1; diff --git a/epan/dissectors/packet-lapdm.c b/epan/dissectors/packet-lapdm.c index 8e20582b4e..03fdd09d0a 100644 --- a/epan/dissectors/packet-lapdm.c +++ b/epan/dissectors/packet-lapdm.c @@ -51,7 +51,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> #include <epan/xdlc.h> diff --git a/epan/dissectors/packet-laplink.c b/epan/dissectors/packet-laplink.c index b3663e054f..2d50322a61 100644 --- a/epan/dissectors/packet-laplink.c +++ b/epan/dissectors/packet-laplink.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-lapsat.c b/epan/dissectors/packet-lapsat.c index 84b453646d..3b0f16b046 100644 --- a/epan/dissectors/packet-lapsat.c +++ b/epan/dissectors/packet-lapsat.c @@ -33,11 +33,8 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/reassemble.h> -#include <epan/wmem/wmem.h> - void proto_register_lapsat(void); void proto_reg_handoff_lapsat(void); diff --git a/epan/dissectors/packet-lbm.c b/epan/dissectors/packet-lbm.c index 347a09be1f..d67d3855f4 100644 --- a/epan/dissectors/packet-lbm.c +++ b/epan/dissectors/packet-lbm.c @@ -23,7 +23,6 @@ */ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-lbm.h" diff --git a/epan/dissectors/packet-lbmc.c b/epan/dissectors/packet-lbmc.c index d646ea18a9..c30e346e05 100644 --- a/epan/dissectors/packet-lbmc.c +++ b/epan/dissectors/packet-lbmc.c @@ -23,12 +23,10 @@ */ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> #include <epan/tap.h> -#include <epan/wmem/wmem.h> #include <epan/to_str.h> #include "packet-lbm.h" #include "packet-lbttcp.h" diff --git a/epan/dissectors/packet-lbmpdm.c b/epan/dissectors/packet-lbmpdm.c index b7f2d3f9b6..bbaaf85a9b 100644 --- a/epan/dissectors/packet-lbmpdm.c +++ b/epan/dissectors/packet-lbmpdm.c @@ -23,10 +23,8 @@ */ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <wsutil/nstime.h> -#include <epan/wmem/wmem.h> #include "packet-lbm.h" /* Magic number for message header to check if data is big-endian or little-endian. */ diff --git a/epan/dissectors/packet-lbmpdmtcp.c b/epan/dissectors/packet-lbmpdmtcp.c index e14d37e013..3894085a67 100644 --- a/epan/dissectors/packet-lbmpdmtcp.c +++ b/epan/dissectors/packet-lbmpdmtcp.c @@ -23,14 +23,14 @@ */ #include "config.h" -#include <glib.h> + #include <epan/packet.h> #include <epan/strutil.h> #include <epan/prefs.h> -#include <epan/dissectors/packet-tcp.h> #include <epan/uat.h> #include <epan/address.h> #include <epan/conversation.h> +#include "packet-tcp.h" #include "packet-lbm.h" void proto_register_lbmpdm_tcp(void); diff --git a/epan/dissectors/packet-lbmr.c b/epan/dissectors/packet-lbmr.c index b9d8a731da..b757bc3b9c 100644 --- a/epan/dissectors/packet-lbmr.c +++ b/epan/dissectors/packet-lbmr.c @@ -29,7 +29,6 @@ #if HAVE_WINSOCK2_H #include <winsock2.h> #endif -#include <glib.h> #include <epan/packet.h> #include <epan/address.h> #include <epan/strutil.h> @@ -38,8 +37,6 @@ #include <epan/stats_tree.h> #include <epan/expert.h> #include <epan/uat.h> -#include <epan/value_string.h> -#include <epan/wmem/wmem.h> #include <epan/to_str.h> #ifndef HAVE_INET_ATON #include <wsutil/inet_aton.h> diff --git a/epan/dissectors/packet-lbtrm.c b/epan/dissectors/packet-lbtrm.c index 51551db570..f3fd4a1e52 100644 --- a/epan/dissectors/packet-lbtrm.c +++ b/epan/dissectors/packet-lbtrm.c @@ -29,12 +29,10 @@ #if HAVE_WINSOCK2_H #include <winsock2.h> #endif -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> #include <epan/uat.h> -#include <epan/wmem/wmem.h> #include <epan/tap.h> #include <epan/conversation.h> #include <epan/to_str.h> diff --git a/epan/dissectors/packet-lbtru.c b/epan/dissectors/packet-lbtru.c index 151d81191a..f1194b9047 100644 --- a/epan/dissectors/packet-lbtru.c +++ b/epan/dissectors/packet-lbtru.c @@ -23,12 +23,10 @@ */ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> #include <epan/uat.h> -#include <epan/wmem/wmem.h> #include <epan/conversation.h> #include <epan/to_str.h> #include <epan/tap.h> diff --git a/epan/dissectors/packet-lbttcp.c b/epan/dissectors/packet-lbttcp.c index c331b782a5..77066d4340 100644 --- a/epan/dissectors/packet-lbttcp.c +++ b/epan/dissectors/packet-lbttcp.c @@ -23,15 +23,14 @@ */ #include "config.h" -#include <glib.h> + #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/dissectors/packet-tcp.h> #include <epan/uat.h> -#include <epan/wmem/wmem.h> #include <epan/address.h> #include <epan/to_str.h> #include <epan/conversation.h> +#include "packet-tcp.h" #include "packet-lbm.h" #include "packet-lbttcp.h" diff --git a/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c index c974c89e28..b492ceb106 100644 --- a/epan/dissectors/packet-ldp.c +++ b/epan/dissectors/packet-ldp.c @@ -39,14 +39,11 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/addr_resolv.h> #include <epan/prefs.h> #include <epan/afn.h> -#include <epan/wmem/wmem.h> #include <epan/expert.h> #include <epan/show_exception.h> diff --git a/epan/dissectors/packet-ldss.c b/epan/dissectors/packet-ldss.c index 8b5ba4d1cb..4b1fb4dc70 100644 --- a/epan/dissectors/packet-ldss.c +++ b/epan/dissectors/packet-ldss.c @@ -40,8 +40,6 @@ #include <string.h> #include <math.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/conversation.h> #include <epan/addr_resolv.h> @@ -49,8 +47,7 @@ #include <epan/prefs.h> #include <epan/expert.h> #include <epan/strutil.h> -#include <epan/wmem/wmem.h> -#include <epan/dissectors/packet-tcp.h> +#include "packet-tcp.h" /* The digest is up to 32 bytes long */ #define DIGEST_LEN 32 diff --git a/epan/dissectors/packet-lge_monitor.c b/epan/dissectors/packet-lge_monitor.c index 9f8af778f4..817131d404 100644 --- a/epan/dissectors/packet-lge_monitor.c +++ b/epan/dissectors/packet-lge_monitor.c @@ -25,8 +25,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-link16.c b/epan/dissectors/packet-link16.c index 557e7ed7f1..b24f763803 100644 --- a/epan/dissectors/packet-link16.c +++ b/epan/dissectors/packet-link16.c @@ -20,7 +20,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-link16.h" diff --git a/epan/dissectors/packet-lisp-data.c b/epan/dissectors/packet-lisp-data.c index cdd890dcf2..cae168e1cc 100644 --- a/epan/dissectors/packet-lisp-data.c +++ b/epan/dissectors/packet-lisp-data.c @@ -24,8 +24,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-lisp-tcp.c b/epan/dissectors/packet-lisp-tcp.c index ddf631c9b9..78b84f259f 100644 --- a/epan/dissectors/packet-lisp-tcp.c +++ b/epan/dissectors/packet-lisp-tcp.c @@ -23,13 +23,13 @@ */ #include "config.h" -#include "packet-tcp.h" #include <epan/packet.h> #include <epan/to_str.h> #include <epan/afn.h> #include <epan/ipv6-utils.h> #include <epan/expert.h> +#include "packet-tcp.h" void proto_register_lisp_tcp(void); void proto_reg_handoff_lisp_tcp(void); diff --git a/epan/dissectors/packet-lisp.c b/epan/dissectors/packet-lisp.c index f957df4e68..caa9609e67 100644 --- a/epan/dissectors/packet-lisp.c +++ b/epan/dissectors/packet-lisp.c @@ -31,8 +31,6 @@ #include <epan/afn.h> #include <epan/ipv6-utils.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> - void proto_register_lisp(void); void proto_reg_handoff_lisp(void); diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c index 08e72e8e20..c8467124ba 100644 --- a/epan/dissectors/packet-llc.c +++ b/epan/dissectors/packet-llc.c @@ -23,10 +23,8 @@ #include "config.h" -#include <glib.h> - -#include <epan/to_str.h> #include <epan/packet.h> +#include <epan/to_str.h> #include <wiretap/wtap.h> #include <wsutil/pint.h> #include <epan/oui.h> diff --git a/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c index 065f345b8e..9660c2c3eb 100644 --- a/epan/dissectors/packet-lldp.c +++ b/epan/dissectors/packet-lldp.c @@ -33,9 +33,7 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include <epan/etypes.h> #include <epan/oui.h> #include <epan/afn.h> diff --git a/epan/dissectors/packet-llrp.c b/epan/dissectors/packet-llrp.c index 8bbbb9910a..8b82b0eea3 100644 --- a/epan/dissectors/packet-llrp.c +++ b/epan/dissectors/packet-llrp.c @@ -27,11 +27,9 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> -#include <epan/dissectors/packet-tcp.h> +#include "packet-tcp.h" void proto_register_llrp(void); void proto_reg_handoff_llrp(void); diff --git a/epan/dissectors/packet-llt.c b/epan/dissectors/packet-llt.c index 8672958469..295519f7b0 100644 --- a/epan/dissectors/packet-llt.c +++ b/epan/dissectors/packet-llt.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-lltd.c b/epan/dissectors/packet-lltd.c index 8a51d5d747..040cb40286 100644 --- a/epan/dissectors/packet-lltd.c +++ b/epan/dissectors/packet-lltd.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/etypes.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-lmi.c b/epan/dissectors/packet-lmi.c index 86adc78b9f..d57a46d1f3 100644 --- a/epan/dissectors/packet-lmi.c +++ b/epan/dissectors/packet-lmi.c @@ -34,7 +34,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/nlpid.h> diff --git a/epan/dissectors/packet-lmp.c b/epan/dissectors/packet-lmp.c index be4618952a..bfee823059 100644 --- a/epan/dissectors/packet-lmp.c +++ b/epan/dissectors/packet-lmp.c @@ -44,8 +44,6 @@ #include <unistd.h> #endif -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-logcat-text.c b/epan/dissectors/packet-logcat-text.c index d01b3fc674..60a7b4677d 100644 --- a/epan/dissectors/packet-logcat-text.c +++ b/epan/dissectors/packet-logcat-text.c @@ -24,13 +24,13 @@ #include "config.h" +#include <stdio.h> + #include "epan/packet.h" #include "epan/expert.h" #include "wiretap/wtap.h" #include "wiretap/logcat_text.h" -#include <stdio.h> - extern const value_string priority_vals[]; static int proto_logcat_text = -1; diff --git a/epan/dissectors/packet-lon.c b/epan/dissectors/packet-lon.c index a4e28cf751..fbcf25d9fa 100644 --- a/epan/dissectors/packet-lon.c +++ b/epan/dissectors/packet-lon.c @@ -28,8 +28,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-loop.c b/epan/dissectors/packet-loop.c index 77f52e3fbc..6347837ec2 100644 --- a/epan/dissectors/packet-loop.c +++ b/epan/dissectors/packet-loop.c @@ -26,7 +26,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-lpd.c b/epan/dissectors/packet-lpd.c index 8168468d3e..13ffec1019 100644 --- a/epan/dissectors/packet-lpd.c +++ b/epan/dissectors/packet-lpd.c @@ -23,7 +23,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> void proto_register_lpd(void); diff --git a/epan/dissectors/packet-lsc.c b/epan/dissectors/packet-lsc.c index ed0759a99b..58fa892020 100644 --- a/epan/dissectors/packet-lsc.c +++ b/epan/dissectors/packet-lsc.c @@ -23,12 +23,10 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> -#include <packet-tcp.h> +#include "packet-tcp.h" void proto_register_lsc(void); void proto_reg_handoff_lsc(void); diff --git a/epan/dissectors/packet-ltp.c b/epan/dissectors/packet-ltp.c index 7c2a2a9ce1..9e62ec1ab9 100644 --- a/epan/dissectors/packet-ltp.c +++ b/epan/dissectors/packet-ltp.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-lwapp.c b/epan/dissectors/packet-lwapp.c index 5d927408ac..1ace3c6ce6 100644 --- a/epan/dissectors/packet-lwapp.c +++ b/epan/dissectors/packet-lwapp.c @@ -26,9 +26,8 @@ #include "config.h" -#include <glib.h> -#include <wsutil/filesystem.h> #include <epan/packet.h> +#include <wsutil/filesystem.h> #include <epan/addr_resolv.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-lwm.c b/epan/dissectors/packet-lwm.c index 90e99ec2ee..8bde495946 100644 --- a/epan/dissectors/packet-lwm.c +++ b/epan/dissectors/packet-lwm.c @@ -24,8 +24,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-lwres.c b/epan/dissectors/packet-lwres.c index 0d2f50c56c..bf09534205 100644 --- a/epan/dissectors/packet-lwres.c +++ b/epan/dissectors/packet-lwres.c @@ -26,8 +26,6 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/to_str.h> diff --git a/epan/dissectors/packet-m2tp.c b/epan/dissectors/packet-m2tp.c index 848a5547be..b3ed1c2ac5 100644 --- a/epan/dissectors/packet-m2tp.c +++ b/epan/dissectors/packet-m2tp.c @@ -29,8 +29,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #define M2TP_PAYLOAD_PROTOCOL_ID 99 /* s-link, not IANA-registered */ diff --git a/epan/dissectors/packet-m3ua.c b/epan/dissectors/packet-m3ua.c index 3fdb6386b9..60852e9c2a 100644 --- a/epan/dissectors/packet-m3ua.c +++ b/epan/dissectors/packet-m3ua.c @@ -32,12 +32,9 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/sctpppids.h> -#include <epan/wmem/wmem.h> #include "packet-mtp3.h" #include "packet-sccp.h" #include "packet-frame.h" diff --git a/epan/dissectors/packet-mac-lte-framed.c b/epan/dissectors/packet-mac-lte-framed.c index 4d7ab4cc2b..25319f29ef 100644 --- a/epan/dissectors/packet-mac-lte-framed.c +++ b/epan/dissectors/packet-mac-lte-framed.c @@ -24,8 +24,6 @@ #include "config.h" #include <epan/packet.h> -#include <epan/wmem/wmem.h> - #include "packet-mac-lte.h" void proto_register_mac_lte_framed(void); diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c index 478942bf19..1034eabd93 100644 --- a/epan/dissectors/packet-mac-lte.c +++ b/epan/dissectors/packet-mac-lte.c @@ -27,8 +27,6 @@ #include <epan/prefs.h> #include <epan/tap.h> #include <epan/uat.h> -#include <epan/wmem/wmem.h> - #include "packet-mac-lte.h" #include "packet-rlc-lte.h" diff --git a/epan/dissectors/packet-maccontrol.c b/epan/dissectors/packet-maccontrol.c index e252e1b048..598576ec15 100644 --- a/epan/dissectors/packet-maccontrol.c +++ b/epan/dissectors/packet-maccontrol.c @@ -30,7 +30,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include "packet-llc.h" diff --git a/epan/dissectors/packet-macsec.c b/epan/dissectors/packet-macsec.c index 6d084bde5b..41addbdfbe 100644 --- a/epan/dissectors/packet-macsec.c +++ b/epan/dissectors/packet-macsec.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-mactelnet.c b/epan/dissectors/packet-mactelnet.c index 7de4c55ac6..019a4d2b90 100644 --- a/epan/dissectors/packet-mactelnet.c +++ b/epan/dissectors/packet-mactelnet.c @@ -28,8 +28,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/to_str.h> diff --git a/epan/dissectors/packet-manolito.c b/epan/dissectors/packet-manolito.c index 7227cdc215..d84fb963da 100644 --- a/epan/dissectors/packet-manolito.c +++ b/epan/dissectors/packet-manolito.c @@ -25,11 +25,7 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <epan/wmem/wmem.h> - void proto_register_manolito(void); void proto_reg_handoff_manolito(void); diff --git a/epan/dissectors/packet-mausb.c b/epan/dissectors/packet-mausb.c index 60405d8f3a..1f128f4fa1 100644 --- a/epan/dissectors/packet-mausb.c +++ b/epan/dissectors/packet-mausb.c @@ -26,14 +26,11 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <epan/dissectors/packet-tcp.h> #include <epan/prefs.h> #include <epan/expert.h> #include <epan/oui.h> - +#include "packet-tcp.h" #include "packet-llc.h" #include "packet-usb.h" diff --git a/epan/dissectors/packet-mbim.c b/epan/dissectors/packet-mbim.c index 61d7c4a288..ebec7290fd 100644 --- a/epan/dissectors/packet-mbim.c +++ b/epan/dissectors/packet-mbim.c @@ -31,7 +31,6 @@ #include <epan/packet.h> #include <epan/expert.h> #include <epan/asn1.h> -#include <epan/wmem/wmem.h> #include <epan/conversation.h> #include <epan/prefs.h> #include <epan/reassemble.h> diff --git a/epan/dissectors/packet-mbtcp.c b/epan/dissectors/packet-mbtcp.c index 281279dd7d..05ef28258e 100644 --- a/epan/dissectors/packet-mbtcp.c +++ b/epan/dissectors/packet-mbtcp.c @@ -74,7 +74,6 @@ #include "config.h" #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include "packet-tcp.h" #include "packet-mbtcp.h" #include "packet-rtacser.h" diff --git a/epan/dissectors/packet-mdshdr.c b/epan/dissectors/packet-mdshdr.c index 99b209f713..eb1ae656a0 100644 --- a/epan/dissectors/packet-mdshdr.c +++ b/epan/dissectors/packet-mdshdr.c @@ -23,10 +23,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <etypes.h> +#include <epan/etypes.h> #include <epan/prefs.h> #include "packet-fc.h" diff --git a/epan/dissectors/packet-media.c b/epan/dissectors/packet-media.c index c96fab9286..a75a3b4473 100644 --- a/epan/dissectors/packet-media.c +++ b/epan/dissectors/packet-media.c @@ -28,7 +28,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> void proto_register_media(void); diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c index ffc7e85d10..e89ff77edb 100644 --- a/epan/dissectors/packet-megaco.c +++ b/epan/dissectors/packet-megaco.c @@ -42,24 +42,20 @@ #include <stdlib.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> -#include <epan/wmem/wmem.h> #include <epan/addr_resolv.h> #include <epan/prefs.h> #include <epan/strutil.h> #include <epan/sctpppids.h> -#include <epan/dissectors/packet-tpkt.h> #include <epan/asn1.h> -#include <epan/dissectors/packet-per.h> -#include <epan/dissectors/packet-h245.h> -#include <epan/dissectors/packet-ip.h> -#include <epan/dissectors/packet-ber.h> - #include <epan/gcp.h> #include <epan/tap.h> +#include "packet-tpkt.h" +#include "packet-per.h" +#include "packet-h245.h" +#include "packet-ip.h" +#include "packet-ber.h" void proto_register_megaco(void); void proto_reg_handoff_megaco(void); diff --git a/epan/dissectors/packet-memcache.c b/epan/dissectors/packet-memcache.c index b58880654c..9deac771e1 100644 --- a/epan/dissectors/packet-memcache.c +++ b/epan/dissectors/packet-memcache.c @@ -33,8 +33,6 @@ #include <stdio.h> #include <stdlib.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/strutil.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-mesh.c b/epan/dissectors/packet-mesh.c index 9c2da18b9b..21adb20a35 100644 --- a/epan/dissectors/packet-mesh.c +++ b/epan/dissectors/packet-mesh.c @@ -24,8 +24,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> void proto_register_mesh(void); diff --git a/epan/dissectors/packet-meta.c b/epan/dissectors/packet-meta.c index c1eda0a58a..a91b4b7ab3 100644 --- a/epan/dissectors/packet-meta.c +++ b/epan/dissectors/packet-meta.c @@ -23,13 +23,9 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <wiretap/wtap.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> - #include "packet-sscop.h" #include "packet-gsm_a_common.h" diff --git a/epan/dissectors/packet-mgcp.c b/epan/dissectors/packet-mgcp.c index ed8dc6c798..1e51e2e145 100644 --- a/epan/dissectors/packet-mgcp.c +++ b/epan/dissectors/packet-mgcp.c @@ -40,7 +40,6 @@ #include <epan/packet.h> #include <epan/exceptions.h> -#include <epan/wmem/wmem.h> #include <epan/prefs.h> #include <epan/conversation.h> #include <epan/tap.h> diff --git a/epan/dissectors/packet-mih.c b/epan/dissectors/packet-mih.c index 18436cad75..2f5071910e 100644 --- a/epan/dissectors/packet-mih.c +++ b/epan/dissectors/packet-mih.c @@ -35,10 +35,7 @@ #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/reassemble.h> -#include <epan/proto.h> #include <epan/etypes.h> -#include <glib.h> - void proto_register_mih(void); void proto_reg_handoff_mih(void); diff --git a/epan/dissectors/packet-mikey.c b/epan/dissectors/packet-mikey.c index e2fed3cf37..9955af94fc 100644 --- a/epan/dissectors/packet-mikey.c +++ b/epan/dissectors/packet-mikey.c @@ -37,13 +37,10 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include <epan/prefs.h> #include <epan/asn1.h> -#include <epan/dissectors/packet-x509af.h> +#include "packet-x509af.h" void proto_register_mikey(void); void proto_reg_handoff_mikey(void); diff --git a/epan/dissectors/packet-mim.c b/epan/dissectors/packet-mim.c index 78bac950e5..181d543b39 100644 --- a/epan/dissectors/packet-mim.c +++ b/epan/dissectors/packet-mim.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/etypes.h> #include <epan/addr_resolv.h> diff --git a/epan/dissectors/packet-mime-encap.c b/epan/dissectors/packet-mime-encap.c index 5ea41006e8..9005c7582d 100644 --- a/epan/dissectors/packet-mime-encap.c +++ b/epan/dissectors/packet-mime-encap.c @@ -21,8 +21,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <wiretap/wtap.h> diff --git a/epan/dissectors/packet-mint.c b/epan/dissectors/packet-mint.c index 71ab45b9c5..936697af0f 100644 --- a/epan/dissectors/packet-mint.c +++ b/epan/dissectors/packet-mint.c @@ -38,12 +38,9 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/etypes.h> -#include <epan/wmem/wmem.h> #include <epan/expert.h> #include <epan/show_exception.h> diff --git a/epan/dissectors/packet-miop.c b/epan/dissectors/packet-miop.c index 9ce42e321a..ecbe386c53 100644 --- a/epan/dissectors/packet-miop.c +++ b/epan/dissectors/packet-miop.c @@ -32,7 +32,6 @@ #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include <epan/expert.h> #include "packet-giop.h" diff --git a/epan/dissectors/packet-mip.c b/epan/dissectors/packet-mip.c index fb179129a9..f801d6bfbe 100644 --- a/epan/dissectors/packet-mip.c +++ b/epan/dissectors/packet-mip.c @@ -26,8 +26,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include <epan/to_str.h> diff --git a/epan/dissectors/packet-mmse.c b/epan/dissectors/packet-mmse.c index 4c9a746b89..4b7937c124 100644 --- a/epan/dissectors/packet-mmse.c +++ b/epan/dissectors/packet-mmse.c @@ -35,12 +35,9 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/to_str.h> #include <epan/strutil.h> -#include <epan/wmem/wmem.h> #include "packet-wap.h" #include "packet-wsp.h" diff --git a/epan/dissectors/packet-mndp.c b/epan/dissectors/packet-mndp.c index 96505bc5bd..8bf3472888 100644 --- a/epan/dissectors/packet-mndp.c +++ b/epan/dissectors/packet-mndp.c @@ -32,10 +32,7 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> -#include <epan/wmem/wmem.h> - void proto_register_mndp(void); void proto_reg_handoff_mndp(void); diff --git a/epan/dissectors/packet-moldudp.c b/epan/dissectors/packet-moldudp.c index 70499c07ca..60df1b9808 100644 --- a/epan/dissectors/packet-moldudp.c +++ b/epan/dissectors/packet-moldudp.c @@ -25,8 +25,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-moldudp64.c b/epan/dissectors/packet-moldudp64.c index 2d8f7c9365..c26939a3ff 100644 --- a/epan/dissectors/packet-moldudp64.c +++ b/epan/dissectors/packet-moldudp64.c @@ -25,8 +25,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-mongo.c b/epan/dissectors/packet-mongo.c index 478546f683..a880db5dc0 100644 --- a/epan/dissectors/packet-mongo.c +++ b/epan/dissectors/packet-mongo.c @@ -31,8 +31,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c index b3c3d63e00..272144e489 100644 --- a/epan/dissectors/packet-mp2t.c +++ b/epan/dissectors/packet-mp2t.c @@ -26,14 +26,11 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <wiretap/wtap.h> #include <epan/rtp_pt.h> -#include <epan/wmem/wmem.h> #include <epan/conversation.h> #include <epan/expert.h> #include <epan/reassemble.h> diff --git a/epan/dissectors/packet-mp4ves.c b/epan/dissectors/packet-mp4ves.c index 72caaf2c5a..46d9ef7f76 100644 --- a/epan/dissectors/packet-mp4ves.c +++ b/epan/dissectors/packet-mp4ves.c @@ -29,8 +29,6 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include <epan/asn1.h> diff --git a/epan/dissectors/packet-mpeg-ca.c b/epan/dissectors/packet-mpeg-ca.c index 09919a296e..850e2dcd50 100644 --- a/epan/dissectors/packet-mpeg-ca.c +++ b/epan/dissectors/packet-mpeg-ca.c @@ -23,11 +23,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <epan/dissectors/packet-mpeg-sect.h> - +#include "packet-mpeg-sect.h" #include "packet-mpeg-descriptor.h" void proto_register_mpeg_ca(void); diff --git a/epan/dissectors/packet-mpeg-descriptor.c b/epan/dissectors/packet-mpeg-descriptor.c index f89f58b08b..55ac9cb73e 100644 --- a/epan/dissectors/packet-mpeg-descriptor.c +++ b/epan/dissectors/packet-mpeg-descriptor.c @@ -23,10 +23,9 @@ #include "config.h" -#include <glib.h> -#include <epan/dvb_chartbl.h> #include <epan/packet.h> -#include <epan/dissectors/packet-mpeg-sect.h> +#include <epan/dvb_chartbl.h> +#include "packet-mpeg-sect.h" #include "packet-mpeg-descriptor.h" void proto_register_mpeg_descriptor(void); diff --git a/epan/dissectors/packet-mpeg-dsmcc.c b/epan/dissectors/packet-mpeg-dsmcc.c index 0292e5731c..776d7d9209 100644 --- a/epan/dissectors/packet-mpeg-dsmcc.c +++ b/epan/dissectors/packet-mpeg-dsmcc.c @@ -24,13 +24,11 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> #include <epan/crc32-tvb.h> -#include <epan/dissectors/packet-mpeg-sect.h> +#include "packet-mpeg-sect.h" void proto_register_dsmcc(void); void proto_reg_handoff_dsmcc(void); diff --git a/epan/dissectors/packet-mpeg-pat.c b/epan/dissectors/packet-mpeg-pat.c index 6832f4a41f..a931ee1c1e 100644 --- a/epan/dissectors/packet-mpeg-pat.c +++ b/epan/dissectors/packet-mpeg-pat.c @@ -23,10 +23,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <epan/dissectors/packet-mpeg-sect.h> +#include "packet-mpeg-sect.h" void proto_register_mpeg_pat(void); void proto_reg_handoff_mpeg_pat(void); diff --git a/epan/dissectors/packet-mpeg-pmt.c b/epan/dissectors/packet-mpeg-pmt.c index 720c10fcca..27465e083c 100644 --- a/epan/dissectors/packet-mpeg-pmt.c +++ b/epan/dissectors/packet-mpeg-pmt.c @@ -23,11 +23,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <epan/dissectors/packet-mpeg-sect.h> - +#include "packet-mpeg-sect.h" #include "packet-mpeg-descriptor.h" void proto_register_mpeg_pmt(void); diff --git a/epan/dissectors/packet-mpeg-sect.c b/epan/dissectors/packet-mpeg-sect.c index e1713bfdd0..9fbd336e52 100644 --- a/epan/dissectors/packet-mpeg-sect.c +++ b/epan/dissectors/packet-mpeg-sect.c @@ -23,13 +23,11 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/crc32-tvb.h> #include <epan/expert.h> -#include <epan/dissectors/packet-mpeg-sect.h> +#include "packet-mpeg-sect.h" void proto_register_mpeg_sect(void); diff --git a/epan/dissectors/packet-mpeg1.c b/epan/dissectors/packet-mpeg1.c index 6e80188113..dceab98fb9 100644 --- a/epan/dissectors/packet-mpeg1.c +++ b/epan/dissectors/packet-mpeg1.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/rtp_pt.h> diff --git a/epan/dissectors/packet-mpls-echo.c b/epan/dissectors/packet-mpls-echo.c index 27f25006c4..26367452fb 100644 --- a/epan/dissectors/packet-mpls-echo.c +++ b/epan/dissectors/packet-mpls-echo.c @@ -32,8 +32,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/sminmpec.h> diff --git a/epan/dissectors/packet-mpls-pm.c b/epan/dissectors/packet-mpls-pm.c index 1d1c18a55b..7d04b23b91 100644 --- a/epan/dissectors/packet-mpls-pm.c +++ b/epan/dissectors/packet-mpls-pm.c @@ -28,10 +28,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <packet-ip.h> +#include "packet-ip.h" void proto_register_mpls_pm(void); void proto_reg_handoff_mpls_pm(void); diff --git a/epan/dissectors/packet-mpls-psc.c b/epan/dissectors/packet-mpls-psc.c index 841941b7d9..7f664ea6bc 100644 --- a/epan/dissectors/packet-mpls-psc.c +++ b/epan/dissectors/packet-mpls-psc.c @@ -28,10 +28,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <packet-ip.h> +#include "packet-ip.h" void proto_register_mpls_psc(void); void proto_reg_handoff_mpls_psc(void); diff --git a/epan/dissectors/packet-mpls-y1711.c b/epan/dissectors/packet-mpls-y1711.c index cb05b86781..30e9c43f64 100644 --- a/epan/dissectors/packet-mpls-y1711.c +++ b/epan/dissectors/packet-mpls-y1711.c @@ -37,8 +37,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/addr_resolv.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-mplstp-oam.c b/epan/dissectors/packet-mplstp-oam.c index 6eac19979c..99451fb7df 100644 --- a/epan/dissectors/packet-mplstp-oam.c +++ b/epan/dissectors/packet-mplstp-oam.c @@ -27,10 +27,9 @@ */ #include "config.h" -#include <glib.h> #include <epan/packet.h> -#include <packet-ip.h> -#include <epan/dissectors/packet-bfd.h> +#include "packet-ip.h" +#include "packet-bfd.h" void proto_register_mplstp_lock(void); void proto_register_mplstp_fm(void); diff --git a/epan/dissectors/packet-mq-base.c b/epan/dissectors/packet-mq-base.c index d5778fda1b..a38b511df1 100644 --- a/epan/dissectors/packet-mq-base.c +++ b/epan/dissectors/packet-mq-base.c @@ -25,7 +25,6 @@ #include "config.h" #include <string.h> -#include <glib.h> #include <epan/packet.h> #include "packet-mq.h" diff --git a/epan/dissectors/packet-mq-pcf.c b/epan/dissectors/packet-mq-pcf.c index ca0fef7c40..75f7841e52 100644 --- a/epan/dissectors/packet-mq-pcf.c +++ b/epan/dissectors/packet-mq-pcf.c @@ -35,15 +35,11 @@ #include <string.h> #include <math.h> -#include <glib.h> #include <epan/packet.h> -#include <epan/proto.h> #include <epan/expert.h> #include <epan/prefs.h> -#include <epan/value_string.h> #include <epan/strutil.h> #include "packet-mq.h" -#include "wmem/wmem.h" void proto_register_mqpcf(void); void proto_reg_handoff_mqpcf(void); diff --git a/epan/dissectors/packet-mq.c b/epan/dissectors/packet-mq.c index f263b28388..88f5900b0a 100644 --- a/epan/dissectors/packet-mq.c +++ b/epan/dissectors/packet-mq.c @@ -67,23 +67,21 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/conversation.h> #include <epan/reassemble.h> -#include <epan/dissectors/packet-windows-common.h> -#include <epan/dissectors/packet-dcerpc.h> #include <epan/expert.h> #include <epan/dissector_filters.h> #include <epan/show_exception.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> #include <epan/strutil.h> +#include "packet-windows-common.h" #include "packet-tcp.h" +#include "packet-dcerpc.h" #include "packet-mq.h" void proto_register_mq(void); diff --git a/epan/dissectors/packet-mqtt.c b/epan/dissectors/packet-mqtt.c index 3ae7ff54eb..3a420389ab 100644 --- a/epan/dissectors/packet-mqtt.c +++ b/epan/dissectors/packet-mqtt.c @@ -25,7 +25,6 @@ */ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/dwarf.h> #include "packet-tcp.h" diff --git a/epan/dissectors/packet-mrcpv2.c b/epan/dissectors/packet-mrcpv2.c index 01154100fa..59165316f0 100644 --- a/epan/dissectors/packet-mrcpv2.c +++ b/epan/dissectors/packet-mrcpv2.c @@ -39,10 +39,9 @@ #include <stdlib.h> #include <string.h> -#include <glib.h> - +#include <epan/packet.h> #include <epan/prefs.h> -#include <epan/dissectors/packet-tcp.h> +#include "packet-tcp.h" #include <wsutil/str_util.h> diff --git a/epan/dissectors/packet-mrdisc.c b/epan/dissectors/packet-mrdisc.c index 273f4542d5..d31ff65600 100644 --- a/epan/dissectors/packet-mrdisc.c +++ b/epan/dissectors/packet-mrdisc.c @@ -36,8 +36,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> diff --git a/epan/dissectors/packet-mrp-msrp.c b/epan/dissectors/packet-mrp-msrp.c index 2975a5d356..50186a6106 100644 --- a/epan/dissectors/packet-mrp-msrp.c +++ b/epan/dissectors/packet-mrp-msrp.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-ms-mms.c b/epan/dissectors/packet-ms-mms.c index a2f2cc3ea0..e7eadbe585 100644 --- a/epan/dissectors/packet-ms-mms.c +++ b/epan/dissectors/packet-ms-mms.c @@ -36,7 +36,6 @@ #include "config.h" -#include <glib.h> #include <stdio.h> #include <string.h> diff --git a/epan/dissectors/packet-msdp.c b/epan/dissectors/packet-msdp.c index 8c842bcd8f..9c756e7a4b 100644 --- a/epan/dissectors/packet-msdp.c +++ b/epan/dissectors/packet-msdp.c @@ -25,8 +25,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/to_str.h> diff --git a/epan/dissectors/packet-msn-messenger.c b/epan/dissectors/packet-msn-messenger.c index d0057fbcc0..d1a148f7aa 100644 --- a/epan/dissectors/packet-msn-messenger.c +++ b/epan/dissectors/packet-msn-messenger.c @@ -25,7 +25,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-msnip.c b/epan/dissectors/packet-msnip.c index a111645bcc..5b90526b9a 100644 --- a/epan/dissectors/packet-msnip.c +++ b/epan/dissectors/packet-msnip.c @@ -35,8 +35,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/to_str.h> #include "packet-igmp.h" diff --git a/epan/dissectors/packet-msnlb.c b/epan/dissectors/packet-msnlb.c index 7d377eeb50..fc36688af2 100644 --- a/epan/dissectors/packet-msnlb.c +++ b/epan/dissectors/packet-msnlb.c @@ -22,7 +22,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/etypes.h> #include <epan/to_str.h> diff --git a/epan/dissectors/packet-msproxy.c b/epan/dissectors/packet-msproxy.c index 681ad2813c..3bc9010687 100644 --- a/epan/dissectors/packet-msproxy.c +++ b/epan/dissectors/packet-msproxy.c @@ -42,12 +42,9 @@ #include "config.h" #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/addr_resolv.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> #include <epan/expert.h> #include "packet-tcp.h" diff --git a/epan/dissectors/packet-msrp.c b/epan/dissectors/packet-msrp.c index c82b2455ea..8c90ccdcd2 100644 --- a/epan/dissectors/packet-msrp.c +++ b/epan/dissectors/packet-msrp.c @@ -28,12 +28,9 @@ #include <stdlib.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/conversation.h> #include <epan/strutil.h> -#include <epan/wmem/wmem.h> #include <epan/prefs.h> #include <wsutil/str_util.h> diff --git a/epan/dissectors/packet-mstp.c b/epan/dissectors/packet-mstp.c index 69c6ed03a0..773ec7de5f 100644 --- a/epan/dissectors/packet-mstp.c +++ b/epan/dissectors/packet-mstp.c @@ -31,8 +31,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <wiretap/wtap.h> #include <epan/oui.h> diff --git a/epan/dissectors/packet-mtp2.c b/epan/dissectors/packet-mtp2.c index ffa720de76..c884ac5ab6 100644 --- a/epan/dissectors/packet-mtp2.c +++ b/epan/dissectors/packet-mtp2.c @@ -28,8 +28,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/crc16-tvb.h> diff --git a/epan/dissectors/packet-mtp3.c b/epan/dissectors/packet-mtp3.c index 8cf850537f..cc2ab94377 100644 --- a/epan/dissectors/packet-mtp3.c +++ b/epan/dissectors/packet-mtp3.c @@ -38,12 +38,9 @@ #include "config.h" #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/tap.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> #include <wiretap/wtap.h> #include "packet-q708.h" @@ -120,7 +117,8 @@ typedef enum { static gint itu_pc_structure = ITU_PC_STRUCTURE_NONE; static gint japan_pc_structure = JAPAN_PC_STRUCTURE_NONE; -#include <packet-mtp3.h> +#include "packet-mtp3.h" + gint mtp3_standard = ITU_STANDARD; gboolean mtp3_heuristic_standard = FALSE; diff --git a/epan/dissectors/packet-mtp3mg.c b/epan/dissectors/packet-mtp3mg.c index 3c2227e625..ba49820ee1 100644 --- a/epan/dissectors/packet-mtp3mg.c +++ b/epan/dissectors/packet-mtp3mg.c @@ -37,12 +37,10 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> -#include <packet-mtp3.h> +#include "packet-mtp3.h" void proto_register_mtp3mg(void); void proto_reg_handoff_mtp3mg(void); diff --git a/epan/dissectors/packet-multipart.c b/epan/dissectors/packet-multipart.c index 9b8dbeb7fa..c3c10635ee 100644 --- a/epan/dissectors/packet-multipart.c +++ b/epan/dissectors/packet-multipart.c @@ -58,13 +58,9 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> - #include "packet-imf.h" void proto_register_multipart(void); diff --git a/epan/dissectors/packet-mux27010.c b/epan/dissectors/packet-mux27010.c index 71240fad60..d0a9429ae4 100644 --- a/epan/dissectors/packet-mux27010.c +++ b/epan/dissectors/packet-mux27010.c @@ -23,13 +23,11 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <wiretap/wtap.h> #include <epan/reassemble.h> #include <epan/crc8-tvb.h> -#include <expert.h> +#include <epan/expert.h> void proto_register_mux27010(void); void proto_reg_handoff_mux27010(void); diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c index 6c812cfe0e..8e9c4c025e 100644 --- a/epan/dissectors/packet-mysql.c +++ b/epan/dissectors/packet-mysql.c @@ -39,11 +39,9 @@ #include <epan/packet.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> - -#include <epan/dissectors/packet-tcp.h> #include <epan/prefs.h> #include <epan/expert.h> +#include "packet-tcp.h" void proto_register_mysql(void); void proto_reg_handoff_mysql(void); diff --git a/epan/dissectors/packet-nas_eps.c b/epan/dissectors/packet-nas_eps.c index fc16cc4779..4ff3e9f339 100644 --- a/epan/dissectors/packet-nas_eps.c +++ b/epan/dissectors/packet-nas_eps.c @@ -26,12 +26,9 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/asn1.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> - #include "packet-gsm_map.h" #include "packet-gsm_a_common.h" #include "packet-e212.h" diff --git a/epan/dissectors/packet-nasdaq-itch.c b/epan/dissectors/packet-nasdaq-itch.c index c36cce4d70..4d6031d87e 100644 --- a/epan/dissectors/packet-nasdaq-itch.c +++ b/epan/dissectors/packet-nasdaq-itch.c @@ -36,11 +36,8 @@ #include <stdlib.h> #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> #include <wsutil/type_util.h> /* Chi-X version */ diff --git a/epan/dissectors/packet-nb_rtpmux.c b/epan/dissectors/packet-nb_rtpmux.c index 422e7fd538..1747a64638 100644 --- a/epan/dissectors/packet-nb_rtpmux.c +++ b/epan/dissectors/packet-nb_rtpmux.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> void proto_register_nb_rtpmux(void); diff --git a/epan/dissectors/packet-nbd.c b/epan/dissectors/packet-nbd.c index ba3acfd47b..366142ccf1 100644 --- a/epan/dissectors/packet-nbd.c +++ b/epan/dissectors/packet-nbd.c @@ -24,12 +24,9 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> #include "packet-tcp.h" void proto_register_nbd(void); diff --git a/epan/dissectors/packet-nbipx.c b/epan/dissectors/packet-nbipx.c index 4236b8af06..3ee08612b7 100644 --- a/epan/dissectors/packet-nbipx.c +++ b/epan/dissectors/packet-nbipx.c @@ -23,7 +23,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/to_str.h> #include "packet-ipx.h" diff --git a/epan/dissectors/packet-nbns.c b/epan/dissectors/packet-nbns.c index e1fbd841c3..1fb22fa4bd 100644 --- a/epan/dissectors/packet-nbns.c +++ b/epan/dissectors/packet-nbns.c @@ -25,12 +25,9 @@ #include "config.h" #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include <epan/exceptions.h> -#include <epan/wmem/wmem.h> #include <epan/prefs.h> #include <epan/strutil.h> #include <epan/show_exception.h> diff --git a/epan/dissectors/packet-ncp-nmas.c b/epan/dissectors/packet-ncp-nmas.c index 4133c65c7d..f5cb3ac5f0 100644 --- a/epan/dissectors/packet-ncp-nmas.c +++ b/epan/dissectors/packet-ncp-nmas.c @@ -24,9 +24,7 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include "packet-ncp-int.h" #include "packet-ncp-nmas.h" diff --git a/epan/dissectors/packet-ncp-sss.c b/epan/dissectors/packet-ncp-sss.c index 60a307b67e..f9feaae1f3 100644 --- a/epan/dissectors/packet-ncp-sss.c +++ b/epan/dissectors/packet-ncp-sss.c @@ -24,7 +24,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/strutil.h> #include "packet-ncp-int.h" diff --git a/epan/dissectors/packet-ncp.c b/epan/dissectors/packet-ncp.c index d813663969..35e481f734 100644 --- a/epan/dissectors/packet-ncp.c +++ b/epan/dissectors/packet-ncp.c @@ -44,10 +44,7 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include <epan/prefs.h> #include "packet-ipx.h" #include "packet-tcp.h" diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index f9c42d2c34..f108e2f1ca 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -31,12 +31,9 @@ #include "config.h" #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/conversation.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> #include "packet-rpc.h" #include "packet-ndmp.h" #include "packet-tcp.h" diff --git a/epan/dissectors/packet-ndp.c b/epan/dissectors/packet-ndp.c index aba0a096ba..6f708bf857 100644 --- a/epan/dissectors/packet-ndp.c +++ b/epan/dissectors/packet-ndp.c @@ -32,8 +32,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/nlpid.h> diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c index 1f5cf8f7b1..5860644b1b 100644 --- a/epan/dissectors/packet-ndps.c +++ b/epan/dissectors/packet-ndps.c @@ -24,15 +24,12 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/prefs.h> #include <epan/reassemble.h> #include <epan/conversation.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> #include <epan/strutil.h> #include "packet-ipx.h" diff --git a/epan/dissectors/packet-negoex.c b/epan/dissectors/packet-negoex.c index b3228db219..8376ddb7bf 100644 --- a/epan/dissectors/packet-negoex.c +++ b/epan/dissectors/packet-negoex.c @@ -25,7 +25,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/show_exception.h> diff --git a/epan/dissectors/packet-netanalyzer.c b/epan/dissectors/packet-netanalyzer.c index 65ccf2be79..367e4a6c0c 100644 --- a/epan/dissectors/packet-netanalyzer.c +++ b/epan/dissectors/packet-netanalyzer.c @@ -56,12 +56,9 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> +#include <epan/expert.h> #include <wiretap/wtap.h> -#include <epan/wmem/wmem.h> -#include <expert.h> void proto_register_netanalyzer(void); void proto_reg_handoff_netanalyzer(void); diff --git a/epan/dissectors/packet-netbios.c b/epan/dissectors/packet-netbios.c index 3049a7d1bb..4ecd5ef154 100644 --- a/epan/dissectors/packet-netbios.c +++ b/epan/dissectors/packet-netbios.c @@ -26,8 +26,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/llcsaps.h> #include <epan/reassemble.h> diff --git a/epan/dissectors/packet-netdump.c b/epan/dissectors/packet-netdump.c index 5ff9445f61..92cf3a9143 100644 --- a/epan/dissectors/packet-netdump.c +++ b/epan/dissectors/packet-netdump.c @@ -24,8 +24,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index 475c11aca6..023ed23926 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -121,15 +121,14 @@ #include "config.h" #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include <epan/prefs.h> #include <wiretap/wtap.h> #include <epan/sminmpec.h> #include <epan/to_str.h> -#include <epan/dissectors/packet-tcp.h> -#include <epan/dissectors/packet-udp.h> -#include "packet-ntp.h" #include <epan/expert.h> +#include "packet-tcp.h" +#include "packet-udp.h" +#include "packet-ntp.h" void proto_register_netflow(void); void proto_reg_handoff_netflow(void); diff --git a/epan/dissectors/packet-netlink-netfilter.c b/epan/dissectors/packet-netlink-netfilter.c index 30e63792c4..7037425c82 100644 --- a/epan/dissectors/packet-netlink-netfilter.c +++ b/epan/dissectors/packet-netlink-netfilter.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include "packet-netlink.h" diff --git a/epan/dissectors/packet-netlink-route.c b/epan/dissectors/packet-netlink-route.c index 5d32fd2121..66545bb8a2 100644 --- a/epan/dissectors/packet-netlink-route.c +++ b/epan/dissectors/packet-netlink-route.c @@ -25,8 +25,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/aftypes.h> diff --git a/epan/dissectors/packet-netlink-sock_diag.c b/epan/dissectors/packet-netlink-sock_diag.c index 8e9d86be35..b7e5c869c0 100644 --- a/epan/dissectors/packet-netlink-sock_diag.c +++ b/epan/dissectors/packet-netlink-sock_diag.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/aftypes.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-netlink.c b/epan/dissectors/packet-netlink.c index 2b6f3f5aee..9cb561b3b6 100644 --- a/epan/dissectors/packet-netlink.c +++ b/epan/dissectors/packet-netlink.c @@ -25,10 +25,8 @@ #include "config.h" -#include <glib.h> - -#include <epan/arptypes.h> #include <epan/packet.h> +#include <epan/arptypes.h> #include <wiretap/wtap.h> #include "packet-netlink.h" diff --git a/epan/dissectors/packet-netrom.c b/epan/dissectors/packet-netrom.c index d0df9f661e..da03a7353d 100644 --- a/epan/dissectors/packet-netrom.c +++ b/epan/dissectors/packet-netrom.c @@ -43,11 +43,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/to_str.h> -#include <epan/wmem/wmem.h> #include <epan/ax25_pids.h> #include "packet-netrom.h" diff --git a/epan/dissectors/packet-netsync.c b/epan/dissectors/packet-netsync.c index 1fa16e04cb..6f5c78f9a5 100644 --- a/epan/dissectors/packet-netsync.c +++ b/epan/dissectors/packet-netsync.c @@ -26,8 +26,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include "dwarf.h" diff --git a/epan/dissectors/packet-nettl.c b/epan/dissectors/packet-nettl.c index 6fc5e41947..bb42dfecda 100644 --- a/epan/dissectors/packet-nettl.c +++ b/epan/dissectors/packet-nettl.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/ipproto.h> #include <wiretap/nettl.h> diff --git a/epan/dissectors/packet-newmail.c b/epan/dissectors/packet-newmail.c index 972ede12b4..62228d81ad 100644 --- a/epan/dissectors/packet-newmail.c +++ b/epan/dissectors/packet-newmail.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-nflog.c b/epan/dissectors/packet-nflog.c index c82bc97485..c417d0510f 100644 --- a/epan/dissectors/packet-nflog.c +++ b/epan/dissectors/packet-nflog.c @@ -24,8 +24,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/aftypes.h> #include <wiretap/wtap.h> diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index 47cb8b74cd..744531479c 100644 --- a/epan/dissectors/packet-nfs.c +++ b/epan/dissectors/packet-nfs.c @@ -27,17 +27,16 @@ #include "config.h" #include <stdio.h> -#include <glib.h> -#include "packet-rpc.h" -#include "packet-nfs.h" -#include <epan/prefs.h> + #include <epan/packet.h> +#include <epan/prefs.h> #include <epan/exceptions.h> -#include <epan/wmem/wmem.h> -#include <wsutil/crc16.h> -#include <wsutil/crc32.h> #include <epan/expert.h> #include <epan/to_str.h> +#include <wsutil/crc16.h> +#include <wsutil/crc32.h> +#include "packet-rpc.h" +#include "packet-nfs.h" void proto_register_nfs(void); void proto_reg_handoff_nfs(void); diff --git a/epan/dissectors/packet-nhrp.c b/epan/dissectors/packet-nhrp.c index e53ca78f80..574fbe8ae1 100644 --- a/epan/dissectors/packet-nhrp.c +++ b/epan/dissectors/packet-nhrp.c @@ -30,8 +30,6 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/addr_resolv.h> #include <epan/expert.h> @@ -43,7 +41,7 @@ #include <epan/afn.h> #include <epan/in_cksum.h> #include <epan/iana_snap_pid.h> -#include <epan/dissectors/packet-llc.h> +#include "packet-llc.h" #include "packet-nhrp.h" void proto_register_nhrp(void); diff --git a/epan/dissectors/packet-nlsp.c b/epan/dissectors/packet-nlsp.c index 39265448c0..fc980d28d7 100644 --- a/epan/dissectors/packet-nlsp.c +++ b/epan/dissectors/packet-nlsp.c @@ -24,7 +24,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include <epan/to_str.h> diff --git a/epan/dissectors/packet-nntp.c b/epan/dissectors/packet-nntp.c index 92d4ca4a5b..9a5d0ff5bb 100644 --- a/epan/dissectors/packet-nntp.c +++ b/epan/dissectors/packet-nntp.c @@ -23,7 +23,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-noe.c b/epan/dissectors/packet-noe.c index 40cc37f6bd..7f8b498b87 100644 --- a/epan/dissectors/packet-noe.c +++ b/epan/dissectors/packet-noe.c @@ -23,11 +23,7 @@ #include "config.h" -#include <glib.h> - #include "epan/packet.h" -#include <epan/wmem/wmem.h> - void proto_register_noe(void); void proto_reg_handoff_noe(void); diff --git a/epan/dissectors/packet-nsip.c b/epan/dissectors/packet-nsip.c index 319406f6d9..697e0cb9c6 100644 --- a/epan/dissectors/packet-nsip.c +++ b/epan/dissectors/packet-nsip.c @@ -27,7 +27,7 @@ #include <epan/packet.h> -#include <prefs.h> +#include <epan/prefs.h> #include <epan/to_str.h> void proto_register_nsip(void); diff --git a/epan/dissectors/packet-nsrp.c b/epan/dissectors/packet-nsrp.c index 680749de31..9eec836730 100644 --- a/epan/dissectors/packet-nsrp.c +++ b/epan/dissectors/packet-nsrp.c @@ -44,8 +44,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-nstrace.c b/epan/dissectors/packet-nstrace.c index 731a96fd5b..eb965fa2a7 100644 --- a/epan/dissectors/packet-nstrace.c +++ b/epan/dissectors/packet-nstrace.c @@ -23,9 +23,7 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include <wiretap/netscaler.h> void proto_register_ns(void); diff --git a/epan/dissectors/packet-nt-tpcp.c b/epan/dissectors/packet-nt-tpcp.c index c68485f0cb..2191006b0c 100644 --- a/epan/dissectors/packet-nt-tpcp.c +++ b/epan/dissectors/packet-nt-tpcp.c @@ -25,8 +25,6 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/addr_resolv.h> /* this is for get_hostname and ep_udp_port_to_display */ diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c index 41e96a6ce1..7a41989c85 100644 --- a/epan/dissectors/packet-ntlmssp.c +++ b/epan/dissectors/packet-ntlmssp.c @@ -30,22 +30,18 @@ #endif #include <string.h> -#include <glib.h> - -#include <wsutil/rc4.h> -#include <wsutil/md4.h> -#include <wsutil/md5.h> -#include <wsutil/des.h> -#include <wsutil/crc32.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/asn1.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> #include <epan/tap.h> #include <epan/expert.h> #include <epan/show_exception.h> +#include <wsutil/rc4.h> +#include <wsutil/md4.h> +#include <wsutil/md5.h> +#include <wsutil/des.h> +#include <wsutil/crc32.h> #include "packet-windows-common.h" #include "packet-smb-common.h" diff --git a/epan/dissectors/packet-ntp.c b/epan/dissectors/packet-ntp.c index f3fbe8f048..f338b9eb58 100644 --- a/epan/dissectors/packet-ntp.c +++ b/epan/dissectors/packet-ntp.c @@ -27,13 +27,9 @@ #include <math.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include <epan/addr_resolv.h> -#include <epan/wmem/wmem.h> - #include <epan/tvbparse.h> #include "packet-ntp.h" diff --git a/epan/dissectors/packet-null.c b/epan/dissectors/packet-null.c index 5c64045b4c..0e5e185707 100644 --- a/epan/dissectors/packet-null.c +++ b/epan/dissectors/packet-null.c @@ -24,7 +24,6 @@ #include "config.h" -#include <glib.h> #include <string.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-nwmtp.c b/epan/dissectors/packet-nwmtp.c index 40f97a1b37..aa56d26194 100644 --- a/epan/dissectors/packet-nwmtp.c +++ b/epan/dissectors/packet-nwmtp.c @@ -24,8 +24,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> void proto_register_mwmtp(void); diff --git a/epan/dissectors/packet-oicq.c b/epan/dissectors/packet-oicq.c index 08a1d2df6c..827bab1941 100644 --- a/epan/dissectors/packet-oicq.c +++ b/epan/dissectors/packet-oicq.c @@ -31,8 +31,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> void proto_register_oicq(void); diff --git a/epan/dissectors/packet-oipf.c b/epan/dissectors/packet-oipf.c index 79c3df15d3..f9869c06c9 100644 --- a/epan/dissectors/packet-oipf.c +++ b/epan/dissectors/packet-oipf.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> void proto_register_oipf(void); diff --git a/epan/dissectors/packet-olsr.c b/epan/dissectors/packet-olsr.c index 2775933869..f367bdbaf4 100644 --- a/epan/dissectors/packet-olsr.c +++ b/epan/dissectors/packet-olsr.c @@ -32,8 +32,6 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-omron-fins.c b/epan/dissectors/packet-omron-fins.c index ebef1405ac..ed3d4b1201 100644 --- a/epan/dissectors/packet-omron-fins.c +++ b/epan/dissectors/packet-omron-fins.c @@ -30,13 +30,9 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> - void proto_register_omron_fins(void); void proto_reg_handoff_omron_fins(void); diff --git a/epan/dissectors/packet-openflow.c b/epan/dissectors/packet-openflow.c index 2b29dbed2b..2ac7d82757 100644 --- a/epan/dissectors/packet-openflow.c +++ b/epan/dissectors/packet-openflow.c @@ -26,8 +26,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-openflow_v1.c b/epan/dissectors/packet-openflow_v1.c index df58342cb1..437b3261e1 100644 --- a/epan/dissectors/packet-openflow_v1.c +++ b/epan/dissectors/packet-openflow_v1.c @@ -26,8 +26,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-openflow_v4.c b/epan/dissectors/packet-openflow_v4.c index 7c1b43ee15..a6b1293628 100644 --- a/epan/dissectors/packet-openflow_v4.c +++ b/epan/dissectors/packet-openflow_v4.c @@ -26,7 +26,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/etypes.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-openflow_v5.c b/epan/dissectors/packet-openflow_v5.c index 6b5458dfd9..5474b13c70 100644 --- a/epan/dissectors/packet-openflow_v5.c +++ b/epan/dissectors/packet-openflow_v5.c @@ -26,7 +26,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/etypes.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-opensafety.c b/epan/dissectors/packet-opensafety.c index 47fdeb124e..efe0c6d35f 100644 --- a/epan/dissectors/packet-opensafety.c +++ b/epan/dissectors/packet-opensafety.c @@ -38,25 +38,21 @@ #include "config.h" -#include <glib.h> +#include <string.h> #include <epan/packet.h> #include <epan/prefs.h> #include <epan/etypes.h> #include <epan/ipproto.h> -#include <epan/wmem/wmem.h> #include <epan/expert.h> #include <epan/reassemble.h> #include <epan/strutil.h> -#include <epan/tfs.h> -#include <epan/dissectors/packet-udp.h> -#include <epan/dissectors/packet-frame.h> #include <wsutil/crc8.h> #include <wsutil/crc16.h> -#include <string.h> - +#include "packet-udp.h" +#include "packet-frame.h" /* General definitions */ diff --git a/epan/dissectors/packet-openvpn.c b/epan/dissectors/packet-openvpn.c index 91c4f98e4a..de0cc2f1de 100644 --- a/epan/dissectors/packet-openvpn.c +++ b/epan/dissectors/packet-openvpn.c @@ -33,9 +33,8 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/reassemble.h> -#include <epan/wmem/wmem.h> -#include <epan/dissectors/packet-tcp.h> #include <epan/ipproto.h> +#include "packet-tcp.h" void proto_register_openvpn(void); void proto_reg_handoff_openvpn(void); diff --git a/epan/dissectors/packet-openwire.c b/epan/dissectors/packet-openwire.c index 0ebef3bcf5..d4ab5de71b 100644 --- a/epan/dissectors/packet-openwire.c +++ b/epan/dissectors/packet-openwire.c @@ -39,14 +39,11 @@ */ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/conversation.h> #include <epan/prefs.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> #include "packet-tcp.h" void proto_register_openwire(void); diff --git a/epan/dissectors/packet-opsi.c b/epan/dissectors/packet-opsi.c index dffe71e311..f1e4d9175d 100644 --- a/epan/dissectors/packet-opsi.c +++ b/epan/dissectors/packet-opsi.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-optommp.c b/epan/dissectors/packet-optommp.c index c3bbb2f585..03827c77b4 100644 --- a/epan/dissectors/packet-optommp.c +++ b/epan/dissectors/packet-optommp.c @@ -23,13 +23,9 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <epan/dissectors/packet-tcp.h> -#include <epan/proto.h> -#include <epan/wmem/wmem.h> #include <epan/prefs.h> +#include "packet-tcp.h" #define OPTO_FRAME_HEADER_LEN 8 #define OPTOMMP_DEST_ID 0x0000 diff --git a/epan/dissectors/packet-osi-options.c b/epan/dissectors/packet-osi-options.c index 4ae49af7b6..865b9aa9df 100644 --- a/epan/dissectors/packet-osi-options.c +++ b/epan/dissectors/packet-osi-options.c @@ -28,7 +28,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include <epan/nlpid.h> diff --git a/epan/dissectors/packet-osi.c b/epan/dissectors/packet-osi.c index 3c2346a5c1..8b565225dd 100644 --- a/epan/dissectors/packet-osi.c +++ b/epan/dissectors/packet-osi.c @@ -26,8 +26,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/llcsaps.h> diff --git a/epan/dissectors/packet-ositp.c b/epan/dissectors/packet-ositp.c index da7ce2260f..d16717f240 100644 --- a/epan/dissectors/packet-ositp.c +++ b/epan/dissectors/packet-ositp.c @@ -26,19 +26,17 @@ #include "config.h" -#include <glib.h> -#include <epan/prefs.h> #include <epan/packet.h> +#include <epan/prefs.h> #include <epan/reassemble.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> -#include "packet-frame.h" -#include "packet-osi.h" -#include "packet-osi-options.h" #include <epan/nlpid.h> #include <epan/ipproto.h> #include <epan/expert.h> #include <epan/strutil.h> +#include "packet-frame.h" +#include "packet-osi.h" +#include "packet-osi-options.h" void proto_register_cotp(void); void proto_register_cltp(void); diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c index 85d7d13f06..b0360ad32c 100644 --- a/epan/dissectors/packet-ospf.c +++ b/epan/dissectors/packet-ospf.c @@ -64,12 +64,10 @@ #include "config.h" #include <string.h> -#include <glib.h> #include <epan/packet.h> #include <epan/ipproto.h> #include <epan/in_cksum.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> #include <epan/addr_resolv.h> #include "packet-rsvp.h" diff --git a/epan/dissectors/packet-ouch.c b/epan/dissectors/packet-ouch.c index f3b41423d2..6bcf8e0bb6 100644 --- a/epan/dissectors/packet-ouch.c +++ b/epan/dissectors/packet-ouch.c @@ -49,8 +49,6 @@ #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> - #include "packet-tcp.h" void proto_register_ouch(void); diff --git a/epan/dissectors/packet-p_mul.c b/epan/dissectors/packet-p_mul.c index a03e69f108..e7cb83916e 100644 --- a/epan/dissectors/packet-p_mul.c +++ b/epan/dissectors/packet-p_mul.c @@ -35,14 +35,14 @@ #include "config.h" +#include <string.h> + #include <epan/packet.h> #include <epan/to_str.h> #include <epan/prefs.h> #include <epan/reassemble.h> #include <epan/expert.h> #include <epan/asn1.h> -#include <epan/wmem/wmem.h> -#include <string.h> #include "packet-cdt.h" #include "packet-ber.h" diff --git a/epan/dissectors/packet-packetbb.c b/epan/dissectors/packet-packetbb.c index 7a79fb7919..87c04f8842 100644 --- a/epan/dissectors/packet-packetbb.c +++ b/epan/dissectors/packet-packetbb.c @@ -25,13 +25,13 @@ */ #include "config.h" +#include <string.h> + #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> #include <epan/uat.h> -#include <string.h> - void proto_reg_handoff_packetbb(void); void proto_register_packetbb(void); diff --git a/epan/dissectors/packet-packetlogger.c b/epan/dissectors/packet-packetlogger.c index 4bfb5cd444..ff5c5216b5 100644 --- a/epan/dissectors/packet-packetlogger.c +++ b/epan/dissectors/packet-packetlogger.c @@ -27,7 +27,7 @@ #include <epan/packet.h> #include <wiretap/wtap.h> -#include <packet-bluetooth.h> +#include "packet-bluetooth.h" void proto_register_packetlogger(void); void proto_reg_handoff_packetlogger(void); diff --git a/epan/dissectors/packet-paltalk.c b/epan/dissectors/packet-paltalk.c index 4983e3230b..7394b6b295 100644 --- a/epan/dissectors/packet-paltalk.c +++ b/epan/dissectors/packet-paltalk.c @@ -26,7 +26,6 @@ #include <string.h> -#include <glib.h> #include <epan/packet.h> #include "packet-tcp.h" diff --git a/epan/dissectors/packet-pana.c b/epan/dissectors/packet-pana.c index 7ad698424f..8381530f49 100644 --- a/epan/dissectors/packet-pana.c +++ b/epan/dissectors/packet-pana.c @@ -28,12 +28,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> - void proto_register_pana(void); void proto_reg_handoff_pana(void); diff --git a/epan/dissectors/packet-pathport.c b/epan/dissectors/packet-pathport.c index 3606f1dd1e..45b3c58d95 100644 --- a/epan/dissectors/packet-pathport.c +++ b/epan/dissectors/packet-pathport.c @@ -22,7 +22,6 @@ */ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/to_str.h> diff --git a/epan/dissectors/packet-pcli.c b/epan/dissectors/packet-pcli.c index 1da1f74542..731efd9bf2 100644 --- a/epan/dissectors/packet-pcli.c +++ b/epan/dissectors/packet-pcli.c @@ -29,8 +29,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/addr_resolv.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-pdc.c b/epan/dissectors/packet-pdc.c index 2e42bcb7e9..92081c3321 100644 --- a/epan/dissectors/packet-pdc.c +++ b/epan/dissectors/packet-pdc.c @@ -21,12 +21,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" -#include <glib.h> -#include <config.h> -#include <epan/prefs.h> #include <epan/packet.h> -#include <epan/dissectors/packet-tcp.h> +#include <epan/prefs.h> +#include "packet-tcp.h" void proto_register_pdc(void); void proto_reg_handoff_pdc(void); diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c index 3e81ae187e..2fe5e0a11c 100644 --- a/epan/dissectors/packet-pdcp-lte.c +++ b/epan/dissectors/packet-pdcp-lte.c @@ -26,13 +26,10 @@ #include <string.h> -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> #include <epan/addr_resolv.h> -#include <epan/wmem/wmem.h> - #include <epan/uat.h> #ifdef HAVE_LIBGCRYPT diff --git a/epan/dissectors/packet-peekremote.c b/epan/dissectors/packet-peekremote.c index f1a802c55f..02a73a7b95 100644 --- a/epan/dissectors/packet-peekremote.c +++ b/epan/dissectors/packet-peekremote.c @@ -51,10 +51,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <expert.h> +#include <epan/expert.h> #include <wiretap/wtap.h> diff --git a/epan/dissectors/packet-per.c b/epan/dissectors/packet-per.c index c77f547629..f36abfd139 100644 --- a/epan/dissectors/packet-per.c +++ b/epan/dissectors/packet-per.c @@ -31,14 +31,11 @@ proper helper routines #include <string.h> #include <math.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/oids.h> #include <epan/to_str.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> #include <epan/asn1.h> #include <epan/strutil.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-pgm.c b/epan/dissectors/packet-pgm.c index 3ac7f22514..75a4398128 100644 --- a/epan/dissectors/packet-pgm.c +++ b/epan/dissectors/packet-pgm.c @@ -32,7 +32,6 @@ #include <epan/addr_resolv.h> #include <epan/strutil.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> #include <epan/ptvcursor.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-pgsql.c b/epan/dissectors/packet-pgsql.c index 4788f68f85..4f4ccf7dbb 100644 --- a/epan/dissectors/packet-pgsql.c +++ b/epan/dissectors/packet-pgsql.c @@ -24,7 +24,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/conversation.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-pim.c b/epan/dissectors/packet-pim.c index d9821b0702..21b4cc5aef 100644 --- a/epan/dissectors/packet-pim.c +++ b/epan/dissectors/packet-pim.c @@ -23,14 +23,11 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/ipproto.h> #include <epan/afn.h> #include <epan/prefs.h> #include <epan/in_cksum.h> -#include <epan/wmem/wmem.h> #include <epan/to_str.h> #include "packet-igmp.h" diff --git a/epan/dissectors/packet-pktap.c b/epan/dissectors/packet-pktap.c index 6a18bef049..44027a42a0 100644 --- a/epan/dissectors/packet-pktap.c +++ b/epan/dissectors/packet-pktap.c @@ -23,11 +23,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> #include <wsutil/pint.h> #include <wiretap/wtap.h> diff --git a/epan/dissectors/packet-pktgen.c b/epan/dissectors/packet-pktgen.c index 53d1a783f5..476d33a738 100644 --- a/epan/dissectors/packet-pktgen.c +++ b/epan/dissectors/packet-pktgen.c @@ -29,8 +29,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> void proto_register_pktgen(void); diff --git a/epan/dissectors/packet-pnrp.c b/epan/dissectors/packet-pnrp.c index 84db9e694a..123b4c52e7 100644 --- a/epan/dissectors/packet-pnrp.c +++ b/epan/dissectors/packet-pnrp.c @@ -32,8 +32,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #define PROTONAME "Peer Name Resolution Protocol" diff --git a/epan/dissectors/packet-pop.c b/epan/dissectors/packet-pop.c index a131becca7..baee3805a0 100644 --- a/epan/dissectors/packet-pop.c +++ b/epan/dissectors/packet-pop.c @@ -29,13 +29,11 @@ #include <stdlib.h> #include <string.h> -#include <glib.h> #include <epan/packet.h> #include <epan/strutil.h> #include <epan/conversation.h> #include <epan/prefs.h> #include <epan/reassemble.h> -#include <epan/wmem/wmem.h> #include "packet-ssl.h" void proto_register_pop(void); diff --git a/epan/dissectors/packet-ppcap.c b/epan/dissectors/packet-ppcap.c index cb6cccd3da..b6ce77c053 100644 --- a/epan/dissectors/packet-ppcap.c +++ b/epan/dissectors/packet-ppcap.c @@ -22,9 +22,7 @@ */ #include "config.h" -#include <glib.h> #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include "packet-mtp3.h" #include <epan/prefs.h> diff --git a/epan/dissectors/packet-ppi-antenna.c b/epan/dissectors/packet-ppi-antenna.c index bf914770cf..2a0ed72b9b 100644 --- a/epan/dissectors/packet-ppi-antenna.c +++ b/epan/dissectors/packet-ppi-antenna.c @@ -25,8 +25,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include "packet-ppi-geolocation-common.h" diff --git a/epan/dissectors/packet-ppi-gps.c b/epan/dissectors/packet-ppi-gps.c index 40db1d7851..203cd69d91 100644 --- a/epan/dissectors/packet-ppi-gps.c +++ b/epan/dissectors/packet-ppi-gps.c @@ -25,7 +25,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include "packet-ppi-geolocation-common.h" diff --git a/epan/dissectors/packet-ppi-sensor.c b/epan/dissectors/packet-ppi-sensor.c index c8ccd5770e..3b2548f083 100644 --- a/epan/dissectors/packet-ppi-sensor.c +++ b/epan/dissectors/packet-ppi-sensor.c @@ -25,8 +25,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include "packet-ppi-geolocation-common.h" diff --git a/epan/dissectors/packet-ppi-vector.c b/epan/dissectors/packet-ppi-vector.c index e7ce8243f1..78b4f27425 100644 --- a/epan/dissectors/packet-ppi-vector.c +++ b/epan/dissectors/packet-ppi-vector.c @@ -31,8 +31,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include "packet-ppi-geolocation-common.h" diff --git a/epan/dissectors/packet-ppi.c b/epan/dissectors/packet-ppi.c index 99de3e160d..44e3faba27 100644 --- a/epan/dissectors/packet-ppi.c +++ b/epan/dissectors/packet-ppi.c @@ -45,8 +45,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/ptvcursor.h> @@ -54,7 +52,6 @@ #include <epan/expert.h> #include <epan/reassemble.h> #include <epan/frequency-utils.h> -#include <epan/wmem/wmem.h> #include <wsutil/pint.h> /* Needed for wtap_pcap_encap_to_wtap_encap(). */ diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index c2f430f7cd..ace7092ca8 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -25,11 +25,9 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <wsutil/pint.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> #include "packet-ppp.h" #include <epan/ppptypes.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-pppoe.c b/epan/dissectors/packet-pppoe.c index cc3b80f860..e9d9931513 100644 --- a/epan/dissectors/packet-pppoe.c +++ b/epan/dissectors/packet-pppoe.c @@ -23,7 +23,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/strutil.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-pptp.c b/epan/dissectors/packet-pptp.c index 62ab6c4469..1761627117 100644 --- a/epan/dissectors/packet-pptp.c +++ b/epan/dissectors/packet-pptp.c @@ -26,7 +26,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-prp.c b/epan/dissectors/packet-prp.c index ef1fdbcebf..3afce6e677 100644 --- a/epan/dissectors/packet-prp.c +++ b/epan/dissectors/packet-prp.c @@ -25,7 +25,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/etypes.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-ptp.c b/epan/dissectors/packet-ptp.c index f56b4470f8..cab14efb1a 100644 --- a/epan/dissectors/packet-ptp.c +++ b/epan/dissectors/packet-ptp.c @@ -47,8 +47,6 @@ #include <math.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-ptpip.c b/epan/dissectors/packet-ptpip.c index 745884ad56..a37654af63 100644 --- a/epan/dissectors/packet-ptpip.c +++ b/epan/dissectors/packet-ptpip.c @@ -33,7 +33,6 @@ * Future work should include splitting this into 2 so that the PTP layer may be used again for PTP/USB. */ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-ptpip.h" diff --git a/epan/dissectors/packet-pvfs2.c b/epan/dissectors/packet-pvfs2.c index 9aeecfa862..e0c3cdda83 100644 --- a/epan/dissectors/packet-pvfs2.c +++ b/epan/dissectors/packet-pvfs2.c @@ -33,12 +33,9 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> #include <epan/strutil.h> #include "packet-tcp.h" diff --git a/epan/dissectors/packet-pw-atm.c b/epan/dissectors/packet-pw-atm.c index d0cd7660ee..52efa3a4df 100644 --- a/epan/dissectors/packet-pw-atm.c +++ b/epan/dissectors/packet-pw-atm.c @@ -36,7 +36,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-pw-cesopsn.c b/epan/dissectors/packet-pw-cesopsn.c index d6b40f5543..1463d42cb8 100644 --- a/epan/dissectors/packet-pw-cesopsn.c +++ b/epan/dissectors/packet-pw-cesopsn.c @@ -32,8 +32,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-pw-eth.c b/epan/dissectors/packet-pw-eth.c index 4ea7758dce..af164220d6 100644 --- a/epan/dissectors/packet-pw-eth.c +++ b/epan/dissectors/packet-pw-eth.c @@ -26,8 +26,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/addr_resolv.h> diff --git a/epan/dissectors/packet-pw-fr.c b/epan/dissectors/packet-pw-fr.c index 86e1c4f6d5..a3e513c732 100644 --- a/epan/dissectors/packet-pw-fr.c +++ b/epan/dissectors/packet-pw-fr.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-pw-hdlc.c b/epan/dissectors/packet-pw-hdlc.c index b8d2396356..1b65d028c2 100644 --- a/epan/dissectors/packet-pw-hdlc.c +++ b/epan/dissectors/packet-pw-hdlc.c @@ -34,8 +34,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include "packet-mpls.h" diff --git a/epan/dissectors/packet-pw-oam.c b/epan/dissectors/packet-pw-oam.c index b683e2ed98..a6c21f8dcb 100644 --- a/epan/dissectors/packet-pw-oam.c +++ b/epan/dissectors/packet-pw-oam.c @@ -25,7 +25,6 @@ */ #include "config.h" -#include <glib.h> #include <epan/packet.h> void proto_register_pw_oam(void); diff --git a/epan/dissectors/packet-pw-satop.c b/epan/dissectors/packet-pw-satop.c index 0197aa1293..4868daffb2 100644 --- a/epan/dissectors/packet-pw-satop.c +++ b/epan/dissectors/packet-pw-satop.c @@ -31,8 +31,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-q2931.c b/epan/dissectors/packet-q2931.c index d06e2c31d6..1f87228880 100644 --- a/epan/dissectors/packet-q2931.c +++ b/epan/dissectors/packet-q2931.c @@ -23,7 +23,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/oui.h> #include <epan/nlpid.h> diff --git a/epan/dissectors/packet-q708.c b/epan/dissectors/packet-q708.c index 5cdf29ee4f..ac1f7c91c6 100644 --- a/epan/dissectors/packet-q708.c +++ b/epan/dissectors/packet-q708.c @@ -23,7 +23,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-q708.h" diff --git a/epan/dissectors/packet-q931.c b/epan/dissectors/packet-q931.c index f6b53cfcdf..6a465f5933 100644 --- a/epan/dissectors/packet-q931.c +++ b/epan/dissectors/packet-q931.c @@ -25,7 +25,6 @@ #include "config.h" -#include <glib.h> #include <string.h> #include <epan/packet.h> #include <epan/tap.h> @@ -36,8 +35,6 @@ #include <epan/prefs.h> #include <epan/expert.h> #include <epan/reassemble.h> -#include <epan/wmem/wmem.h> - #include <epan/sctpppids.h> #include <epan/lapd_sapi.h> #include "packet-tpkt.h" diff --git a/epan/dissectors/packet-q933.c b/epan/dissectors/packet-q933.c index a4fcf2c43a..dd09c0fd13 100644 --- a/epan/dissectors/packet-q933.c +++ b/epan/dissectors/packet-q933.c @@ -23,7 +23,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-qllc.c b/epan/dissectors/packet-qllc.c index 9d6248be31..54d041412e 100644 --- a/epan/dissectors/packet-qllc.c +++ b/epan/dissectors/packet-qllc.c @@ -23,7 +23,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> void proto_register_qllc(void); diff --git a/epan/dissectors/packet-quake.c b/epan/dissectors/packet-quake.c index cd0fa2e82e..cb06a87f66 100644 --- a/epan/dissectors/packet-quake.c +++ b/epan/dissectors/packet-quake.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/conversation.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-quake2.c b/epan/dissectors/packet-quake2.c index 24572993c8..61a6019e64 100644 --- a/epan/dissectors/packet-quake2.c +++ b/epan/dissectors/packet-quake2.c @@ -30,7 +30,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-quake3.c b/epan/dissectors/packet-quake3.c index bf91c47ed3..9d0906bd21 100644 --- a/epan/dissectors/packet-quake3.c +++ b/epan/dissectors/packet-quake3.c @@ -38,7 +38,6 @@ #include "config.h" #include <string.h> -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> #include <epan/addr_resolv.h> diff --git a/epan/dissectors/packet-quakeworld.c b/epan/dissectors/packet-quakeworld.c index d915d43a8e..94586dd6bb 100644 --- a/epan/dissectors/packet-quakeworld.c +++ b/epan/dissectors/packet-quakeworld.c @@ -27,15 +27,11 @@ #include "config.h" -#include <glib.h> - #include <stdlib.h> #include <string.h> #include <epan/packet.h> #include <epan/prefs.h> #include <epan/strutil.h> -#include <epan/wmem/wmem.h> - void proto_register_quakeworld(void); static int proto_quakeworld = -1; diff --git a/epan/dissectors/packet-quic.c b/epan/dissectors/packet-quic.c index f26f829d9a..6ce1371415 100644 --- a/epan/dissectors/packet-quic.c +++ b/epan/dissectors/packet-quic.c @@ -29,8 +29,6 @@ QUIC source code in Chromium : https://code.google.com/p/chromium/codesearch#chr */ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c index c5f8d73a96..74de0c56e5 100644 --- a/epan/dissectors/packet-radius.c +++ b/epan/dissectors/packet-radius.c @@ -57,22 +57,19 @@ #include <string.h> #include <errno.h> -#include <glib.h> - -#include <wsutil/report_err.h> -#include <wsutil/md5.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/expert.h> #include <epan/prefs.h> #include <epan/sminmpec.h> -#include <wsutil/filesystem.h> #include <epan/conversation.h> #include <epan/tap.h> #include <epan/addr_resolv.h> #include <epan/garrayfix.h> -#include <epan/wmem/wmem.h> +#include <wsutil/filesystem.h> +#include <wsutil/report_err.h> +#include <wsutil/md5.h> + #include "packet-radius.h" diff --git a/epan/dissectors/packet-raknet.c b/epan/dissectors/packet-raknet.c index 1924d53af6..b7a01d2d6f 100644 --- a/epan/dissectors/packet-raknet.c +++ b/epan/dissectors/packet-raknet.c @@ -27,8 +27,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "config.h" -#include <epan/expert.h> + #include <epan/packet.h> +#include <epan/expert.h> /* * RAKNET Protocol Constants. diff --git a/epan/dissectors/packet-raw.c b/epan/dissectors/packet-raw.c index 1f81a69cc8..7f464f58cb 100644 --- a/epan/dissectors/packet-raw.c +++ b/epan/dissectors/packet-raw.c @@ -25,7 +25,6 @@ #include "config.h" #include <string.h> -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include <wiretap/wtap.h> diff --git a/epan/dissectors/packet-rdm.c b/epan/dissectors/packet-rdm.c index 1f57a10f75..1f72e24c17 100644 --- a/epan/dissectors/packet-rdm.c +++ b/epan/dissectors/packet-rdm.c @@ -42,9 +42,8 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> -#include <epan/dissectors/packet-rdm.h> +#include "packet-rdm.h" void proto_register_rdm(void); diff --git a/epan/dissectors/packet-rdp.c b/epan/dissectors/packet-rdp.c index 6082641213..08310f02d2 100644 --- a/epan/dissectors/packet-rdp.c +++ b/epan/dissectors/packet-rdp.c @@ -27,11 +27,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> #include <epan/conversation.h> #include <epan/asn1.h> #include "packet-tpkt.h" diff --git a/epan/dissectors/packet-rdt.c b/epan/dissectors/packet-rdt.c index a3031afde3..af4d92e52a 100644 --- a/epan/dissectors/packet-rdt.c +++ b/epan/dissectors/packet-rdt.c @@ -32,15 +32,11 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include <epan/conversation.h> #include <epan/prefs.h> #include <epan/strutil.h> -#include <epan/wmem/wmem.h> - #include "packet-rdt.h" static dissector_handle_t rdt_handle; diff --git a/epan/dissectors/packet-redback.c b/epan/dissectors/packet-redback.c index b59aa78070..d6469c633c 100644 --- a/epan/dissectors/packet-redback.c +++ b/epan/dissectors/packet-redback.c @@ -25,8 +25,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include <wiretap/wtap.h> diff --git a/epan/dissectors/packet-redbackli.c b/epan/dissectors/packet-redbackli.c index 013fd7d6da..75297014fd 100644 --- a/epan/dissectors/packet-redbackli.c +++ b/epan/dissectors/packet-redbackli.c @@ -25,8 +25,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/addr_resolv.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-reload-framing.c b/epan/dissectors/packet-reload-framing.c index c1cf0d9341..25acb93104 100644 --- a/epan/dissectors/packet-reload-framing.c +++ b/epan/dissectors/packet-reload-framing.c @@ -27,12 +27,12 @@ #include "config.h" +#include <epan/packet.h> #include <epan/conversation.h> #include <epan/expert.h> #include <epan/tap.h> #include <epan/exported_pdu.h> -#include <epan/wmem/wmem.h> -#include <packet-tcp.h> +#include "packet-tcp.h" void proto_register_reload_framing(void); void proto_reg_handoff_reload_framing(void); diff --git a/epan/dissectors/packet-reload.c b/epan/dissectors/packet-reload.c index 89167111a7..dbb383ddb0 100644 --- a/epan/dissectors/packet-reload.c +++ b/epan/dissectors/packet-reload.c @@ -32,18 +32,18 @@ #include "config.h" +#include <epan/packet.h> #include <epan/conversation.h> #include <epan/prefs.h> #include <epan/reassemble.h> #include <epan/expert.h> #include <epan/asn1.h> #include <epan/uat.h> -#include <epan/wmem/wmem.h> #include <epan/to_str.h> -#include <epan/dissectors/packet-x509af.h> -#include <packet-tcp.h> -#include <packet-ssl-utils.h> -#include <packet-reload.h> +#include "packet-x509af.h" +#include "packet-tcp.h" +#include "packet-ssl-utils.h" +#include "packet-reload.h" void proto_register_reload(void); void proto_reg_handoff_reload(void); diff --git a/epan/dissectors/packet-retix-bpdu.c b/epan/dissectors/packet-retix-bpdu.c index 092985abb7..549eedb1d0 100644 --- a/epan/dissectors/packet-retix-bpdu.c +++ b/epan/dissectors/packet-retix-bpdu.c @@ -26,7 +26,6 @@ #if 0 #endif -#include <glib.h> #include <epan/packet.h> #if 0 #include <epan/llcsaps.h> diff --git a/epan/dissectors/packet-rfc2190.c b/epan/dissectors/packet-rfc2190.c index bc5a9c6be6..dcb07bc4e6 100644 --- a/epan/dissectors/packet-rfc2190.c +++ b/epan/dissectors/packet-rfc2190.c @@ -34,7 +34,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/rtp_pt.h> diff --git a/epan/dissectors/packet-rfid-felica.c b/epan/dissectors/packet-rfid-felica.c index f678314adc..73ba1a80f6 100644 --- a/epan/dissectors/packet-rfid-felica.c +++ b/epan/dissectors/packet-rfid-felica.c @@ -33,8 +33,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-rfid-mifare.c b/epan/dissectors/packet-rfid-mifare.c index 95d010714e..be675fff3b 100644 --- a/epan/dissectors/packet-rfid-mifare.c +++ b/epan/dissectors/packet-rfid-mifare.c @@ -30,7 +30,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> void proto_register_mifare(void); diff --git a/epan/dissectors/packet-rfid-pn532-hci.c b/epan/dissectors/packet-rfid-pn532-hci.c index 733a16bf24..acf08e28d8 100644 --- a/epan/dissectors/packet-rfid-pn532-hci.c +++ b/epan/dissectors/packet-rfid-pn532-hci.c @@ -29,8 +29,6 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> - #include "packet-usb.h" static int proto_pn532_hci = -1; diff --git a/epan/dissectors/packet-rfid-pn532.c b/epan/dissectors/packet-rfid-pn532.c index dbe670e0f8..556b7ef242 100644 --- a/epan/dissectors/packet-rfid-pn532.c +++ b/epan/dissectors/packet-rfid-pn532.c @@ -29,12 +29,9 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> - #include "packet-usb.h" static int proto_pn532 = -1; diff --git a/epan/dissectors/packet-rgmp.c b/epan/dissectors/packet-rgmp.c index e646b1a21d..71595bf244 100644 --- a/epan/dissectors/packet-rgmp.c +++ b/epan/dissectors/packet-rgmp.c @@ -29,7 +29,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/strutil.h> #include "packet-igmp.h" diff --git a/epan/dissectors/packet-rip.c b/epan/dissectors/packet-rip.c index 88674a4b8c..f934e087b1 100644 --- a/epan/dissectors/packet-rip.c +++ b/epan/dissectors/packet-rip.c @@ -29,10 +29,8 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> -#include <epan/emem.h> #include <epan/prefs.h> #include <epan/to_str.h> diff --git a/epan/dissectors/packet-ripng.c b/epan/dissectors/packet-ripng.c index 8ad20f11da..80708c1662 100644 --- a/epan/dissectors/packet-ripng.c +++ b/epan/dissectors/packet-ripng.c @@ -29,7 +29,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/to_str.h> diff --git a/epan/dissectors/packet-rlc-lte.c b/epan/dissectors/packet-rlc-lte.c index 4b7d2bea52..10408ca632 100644 --- a/epan/dissectors/packet-rlc-lte.c +++ b/epan/dissectors/packet-rlc-lte.c @@ -31,8 +31,6 @@ #include <epan/expert.h> #include <epan/prefs.h> #include <epan/tap.h> -#include <epan/wmem/wmem.h> - #include "packet-mac-lte.h" #include "packet-rlc-lte.h" #include "packet-pdcp-lte.h" diff --git a/epan/dissectors/packet-rlc.c b/epan/dissectors/packet-rlc.c index f4d77a6ada..33ed719be4 100644 --- a/epan/dissectors/packet-rlc.c +++ b/epan/dissectors/packet-rlc.c @@ -24,10 +24,7 @@ #include "config.h" #include <string.h> -#include <glib.h> - #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include <epan/conversation.h> #include <epan/asn1.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-rlm.c b/epan/dissectors/packet-rlm.c index 193da875e1..c91c052f27 100644 --- a/epan/dissectors/packet-rlm.c +++ b/epan/dissectors/packet-rlm.c @@ -47,8 +47,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/xdlc.h> diff --git a/epan/dissectors/packet-rlogin.c b/epan/dissectors/packet-rlogin.c index 7536d5ca19..58a44ff948 100644 --- a/epan/dissectors/packet-rlogin.c +++ b/epan/dissectors/packet-rlogin.c @@ -27,12 +27,8 @@ #include <stdlib.h> #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> - #include "packet-tcp.h" #define RLOGIN_PORT 513 diff --git a/epan/dissectors/packet-rmcp.c b/epan/dissectors/packet-rmcp.c index 4275f3febe..9195f66650 100644 --- a/epan/dissectors/packet-rmcp.c +++ b/epan/dissectors/packet-rmcp.c @@ -26,7 +26,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> void proto_register_rmcp(void); diff --git a/epan/dissectors/packet-rmi.c b/epan/dissectors/packet-rmi.c index 3cf47283c6..851afd6b0c 100644 --- a/epan/dissectors/packet-rmi.c +++ b/epan/dissectors/packet-rmi.c @@ -25,8 +25,6 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-rmp.c b/epan/dissectors/packet-rmp.c index 0e9993ab87..028aabcc83 100644 --- a/epan/dissectors/packet-rmp.c +++ b/epan/dissectors/packet-rmp.c @@ -23,7 +23,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-rmt-alc.c b/epan/dissectors/packet-rmt-alc.c index 5560569074..593235b27b 100644 --- a/epan/dissectors/packet-rmt-alc.c +++ b/epan/dissectors/packet-rmt-alc.c @@ -38,8 +38,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-rmt-fec.c b/epan/dissectors/packet-rmt-fec.c index e5c7c5d7eb..ece0ef0a1d 100644 --- a/epan/dissectors/packet-rmt-fec.c +++ b/epan/dissectors/packet-rmt-fec.c @@ -38,12 +38,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> - #include "packet-rmt-common.h" void proto_register_rmt_fec(void); diff --git a/epan/dissectors/packet-rmt-lct.c b/epan/dissectors/packet-rmt-lct.c index 7cdb0721f2..17e6ef4418 100644 --- a/epan/dissectors/packet-rmt-lct.c +++ b/epan/dissectors/packet-rmt-lct.c @@ -38,14 +38,12 @@ #include "config.h" -#include <glib.h> +#include <math.h> #include <epan/packet.h> #include <epan/params.h> #include <epan/strutil.h> -#include <math.h> - #include "packet-rmt-common.h" #define LCT_SCT_FLAG 0x0008 diff --git a/epan/dissectors/packet-rmt-norm.c b/epan/dissectors/packet-rmt-norm.c index 5c7574fcb2..ae760cebdd 100644 --- a/epan/dissectors/packet-rmt-norm.c +++ b/epan/dissectors/packet-rmt-norm.c @@ -39,14 +39,11 @@ #include "config.h" -#include <glib.h> #include <math.h> #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> - #include "packet-rmt-common.h" void proto_register_norm(void); diff --git a/epan/dissectors/packet-rohc.c b/epan/dissectors/packet-rohc.c index 1491565e12..ca5a1b6c1f 100644 --- a/epan/dissectors/packet-rohc.c +++ b/epan/dissectors/packet-rohc.c @@ -30,16 +30,12 @@ #include "config.h" -#include <glib.h> -#include <epan/proto.h> #include <epan/packet.h> #include <epan/etypes.h> #include <epan/ipproto.h> #include <epan/addr_resolv.h> #include <epan/rtp_pt.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> - #include "packet-rohc.h" void proto_register_rohc(void); diff --git a/epan/dissectors/packet-roofnet.c b/epan/dissectors/packet-roofnet.c index 3bfe4bdc9e..27c14b7381 100644 --- a/epan/dissectors/packet-roofnet.c +++ b/epan/dissectors/packet-roofnet.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/addr_resolv.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c index cf3faeeadb..ce1f9a22d4 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.c @@ -25,8 +25,6 @@ #include "config.h" -#include <glib.h> - #include <string.h> #include <epan/packet.h> @@ -34,7 +32,6 @@ #include <epan/exceptions.h> #include <wsutil/pint.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> #include <epan/prefs.h> #include <epan/reassemble.h> #include <epan/tap.h> diff --git a/epan/dissectors/packet-rpcap.c b/epan/dissectors/packet-rpcap.c index 88468eecef..77a0618272 100644 --- a/epan/dissectors/packet-rpcap.c +++ b/epan/dissectors/packet-rpcap.c @@ -25,13 +25,11 @@ #include "config.h" -#include <epan/aftypes.h> #include <epan/packet.h> +#include <epan/aftypes.h> #include <epan/prefs.h> #include <epan/to_str.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> - #include <wiretap/wtap.h> #include "packet-frame.h" diff --git a/epan/dissectors/packet-rpki-rtr.c b/epan/dissectors/packet-rpki-rtr.c index a58d849c90..0f10b56688 100644 --- a/epan/dissectors/packet-rpki-rtr.c +++ b/epan/dissectors/packet-rpki-rtr.c @@ -26,14 +26,12 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include "packet-tcp.h" #include <epan/expert.h> #include <epan/asn1.h> -#include <epan/dissectors/packet-x509af.h> +#include "packet-x509af.h" void proto_register_rpkirtr(void); void proto_reg_handoff_rpkirtr(void); diff --git a/epan/dissectors/packet-rpl.c b/epan/dissectors/packet-rpl.c index e725d76b37..8a69546038 100644 --- a/epan/dissectors/packet-rpl.c +++ b/epan/dissectors/packet-rpl.c @@ -23,7 +23,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/llcsaps.h> diff --git a/epan/dissectors/packet-rquota.c b/epan/dissectors/packet-rquota.c index f4472d3cf4..286dec412d 100644 --- a/epan/dissectors/packet-rquota.c +++ b/epan/dissectors/packet-rquota.c @@ -25,8 +25,6 @@ #include "config.h" - - #include "packet-rpc.h" #include "packet-rquota.h" diff --git a/epan/dissectors/packet-rsh.c b/epan/dissectors/packet-rsh.c index deeff979e6..26ec6e3c17 100644 --- a/epan/dissectors/packet-rsh.c +++ b/epan/dissectors/packet-rsh.c @@ -28,12 +28,9 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/conversation.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> #include <wsutil/str_util.h> /* The rsh protocol uses TCP port 512 per its IANA assignment */ diff --git a/epan/dissectors/packet-rsip.c b/epan/dissectors/packet-rsip.c index 6bc7b8b572..b573bb1d54 100644 --- a/epan/dissectors/packet-rsip.c +++ b/epan/dissectors/packet-rsip.c @@ -25,8 +25,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/to_str.h> #include <epan/ipproto.h> diff --git a/epan/dissectors/packet-rstat.c b/epan/dissectors/packet-rstat.c index 9512eff37f..143a381cda 100644 --- a/epan/dissectors/packet-rstat.c +++ b/epan/dissectors/packet-rstat.c @@ -24,8 +24,6 @@ #include "config.h" - - #include "packet-rpc.h" void proto_register_rstat(void); diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c index 68ecceb9a7..75559c4617 100644 --- a/epan/dissectors/packet-rsvp.c +++ b/epan/dissectors/packet-rsvp.c @@ -98,12 +98,10 @@ #include <unistd.h> #endif -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include <epan/exceptions.h> -#include <prefs.h> +#include <epan/prefs.h> #include <epan/to_str.h> #include <epan/in_cksum.h> #include <epan/etypes.h> @@ -112,8 +110,6 @@ #include <epan/conversation_table.h> #include <epan/tap.h> #include <epan/sminmpec.h> -#include <epan/wmem/wmem.h> - #include "packet-rsvp.h" #include "packet-ip.h" #include "packet-diffserv-mpls-common.h" diff --git a/epan/dissectors/packet-rsync.c b/epan/dissectors/packet-rsync.c index a6f927f0e2..5bf1ef2089 100644 --- a/epan/dissectors/packet-rsync.c +++ b/epan/dissectors/packet-rsync.c @@ -28,12 +28,9 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/strutil.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> #include <epan/prefs.h> void proto_register_rsync(void); diff --git a/epan/dissectors/packet-rtcdc.c b/epan/dissectors/packet-rtcdc.c index 7ff45ef98e..faeca65080 100644 --- a/epan/dissectors/packet-rtcdc.c +++ b/epan/dissectors/packet-rtcdc.c @@ -31,10 +31,8 @@ #include "config.h" -#include <glib.h> - -#include <epan/expert.h> #include <epan/packet.h> +#include <epan/expert.h> #include <epan/prefs.h> #include <epan/sctpppids.h> diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index a84c6137fb..3fc1a9b189 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -66,7 +66,6 @@ #include <stdlib.h> -#include <glib.h> #include <epan/packet.h> #include "packet-rtcp.h" @@ -77,7 +76,6 @@ #include <epan/prefs.h> #include <epan/expert.h> #include <epan/strutil.h> -#include <epan/wmem/wmem.h> #include <epan/to_str.h> void proto_register_rtcp(void); diff --git a/epan/dissectors/packet-rtmpt.c b/epan/dissectors/packet-rtmpt.c index da9a75b536..c7177b8e1e 100644 --- a/epan/dissectors/packet-rtmpt.c +++ b/epan/dissectors/packet-rtmpt.c @@ -73,7 +73,6 @@ #include <epan/packet.h> #include <wsutil/pint.h> -#include <epan/wmem/wmem.h> #include <epan/conversation.h> #include <epan/strutil.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-rtnet.c b/epan/dissectors/packet-rtnet.c index f8bbde6c95..4803b231b4 100644 --- a/epan/dissectors/packet-rtnet.c +++ b/epan/dissectors/packet-rtnet.c @@ -27,8 +27,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/addr_resolv.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-rtp-events.c b/epan/dissectors/packet-rtp-events.c index 9d96e047f7..04a8825a06 100644 --- a/epan/dissectors/packet-rtp-events.c +++ b/epan/dissectors/packet-rtp-events.c @@ -35,7 +35,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-rtp-midi.c b/epan/dissectors/packet-rtp-midi.c index 315664ad02..1e35cb8e9c 100644 --- a/epan/dissectors/packet-rtp-midi.c +++ b/epan/dissectors/packet-rtp-midi.c @@ -48,8 +48,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c index ef1633edb8..229f90effc 100644 --- a/epan/dissectors/packet-rtp.c +++ b/epan/dissectors/packet-rtp.c @@ -67,7 +67,6 @@ #include <epan/tap.h> #include <epan/epan_dissect.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> #include <epan/strutil.h> /* un-comment the following as well as this line in conversation.c, to enable debug printing */ diff --git a/epan/dissectors/packet-rtpproxy.c b/epan/dissectors/packet-rtpproxy.c index 6552df4a4e..f5c5200af5 100644 --- a/epan/dissectors/packet-rtpproxy.c +++ b/epan/dissectors/packet-rtpproxy.c @@ -29,10 +29,9 @@ #include "config.h" #include <stdlib.h> -#include <glib.h> -#include <epan/address.h> #include <epan/packet.h> +#include <epan/address.h> #include <epan/prefs.h> #include <epan/conversation.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c index 0e3ee2bdf3..3321897740 100644 --- a/epan/dissectors/packet-rtps.c +++ b/epan/dissectors/packet-rtps.c @@ -51,13 +51,10 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include <epan/prefs.h> #include <epan/addr_resolv.h> -#include <epan/wmem/wmem.h> - #include "packet-rtps.h" void proto_register_rtps(void); diff --git a/epan/dissectors/packet-rtsp.c b/epan/dissectors/packet-rtsp.c index 21913d085e..970bff011e 100644 --- a/epan/dissectors/packet-rtsp.c +++ b/epan/dissectors/packet-rtsp.c @@ -32,8 +32,6 @@ #include <stdio.h> #include <stdlib.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/req_resp_hdrs.h> #include <epan/prefs.h> @@ -42,7 +40,6 @@ #include <epan/tap.h> #include <epan/tap-voip.h> #include <epan/stats_tree.h> -#include <epan/wmem/wmem.h> #include <wsutil/str_util.h> #include "packet-rdt.h" diff --git a/epan/dissectors/packet-rudp.c b/epan/dissectors/packet-rudp.c index 64471f0645..13bbae29c8 100644 --- a/epan/dissectors/packet-rudp.c +++ b/epan/dissectors/packet-rudp.c @@ -42,7 +42,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-rx.c b/epan/dissectors/packet-rx.c index 531f4f7784..39c24b3103 100644 --- a/epan/dissectors/packet-rx.c +++ b/epan/dissectors/packet-rx.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-rx.h" #include <epan/addr_resolv.h> diff --git a/epan/dissectors/packet-s5066dts.c b/epan/dissectors/packet-s5066dts.c index 3dfc9ff3c8..0d559e7cf1 100644 --- a/epan/dissectors/packet-s5066dts.c +++ b/epan/dissectors/packet-s5066dts.c @@ -27,9 +27,10 @@ #include "config.h" +#include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> -#include <epan/dissectors/packet-tcp.h> /* For tcp_dissect_pdus() */ +#include "packet-tcp.h" /* For tcp_dissect_pdus() */ #include <epan/crc16-tvb.h> #include <epan/crc32-tvb.h> #include <wiretap/wtap.h> diff --git a/epan/dissectors/packet-s5066sis.c b/epan/dissectors/packet-s5066sis.c index 241f619fc1..f54dc81025 100644 --- a/epan/dissectors/packet-s5066sis.c +++ b/epan/dissectors/packet-s5066sis.c @@ -25,10 +25,9 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/dissectors/packet-tcp.h> /* For tcp_dissect_pdus() */ +#include "packet-tcp.h" /* For tcp_dissect_pdus() */ /* Forward reference */ /* Register functions */ diff --git a/epan/dissectors/packet-s7comm.c b/epan/dissectors/packet-s7comm.c index 79b729b39f..a2433d19a2 100644 --- a/epan/dissectors/packet-s7comm.c +++ b/epan/dissectors/packet-s7comm.c @@ -24,7 +24,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-s7comm.h" diff --git a/epan/dissectors/packet-s7comm_szl_ids.c b/epan/dissectors/packet-s7comm_szl_ids.c index 158c2a3e73..5291f64f05 100644 --- a/epan/dissectors/packet-s7comm_szl_ids.c +++ b/epan/dissectors/packet-s7comm_szl_ids.c @@ -24,7 +24,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-s7comm.h" diff --git a/epan/dissectors/packet-sadmind.c b/epan/dissectors/packet-sadmind.c index 851609a8b2..70b9e4a258 100644 --- a/epan/dissectors/packet-sadmind.c +++ b/epan/dissectors/packet-sadmind.c @@ -24,8 +24,6 @@ #include "config.h" - - #include "packet-rpc.h" void proto_register_sadmind(void); diff --git a/epan/dissectors/packet-sametime.c b/epan/dissectors/packet-sametime.c index 3cbe51291d..fb224a47a5 100644 --- a/epan/dissectors/packet-sametime.c +++ b/epan/dissectors/packet-sametime.c @@ -24,11 +24,10 @@ #include "config.h" #include <epan/packet.h> -#include <epan/wmem/wmem.h> -#include <epan/dissectors/packet-tcp.h> #include <epan/prefs.h> #include <epan/tap.h> #include <epan/stats_tree.h> +#include "packet-tcp.h" #define DEFAULT_SAMETIME_PORT 1533 diff --git a/epan/dissectors/packet-sap.c b/epan/dissectors/packet-sap.c index cbdb24f1ff..9931fc3d8c 100644 --- a/epan/dissectors/packet-sap.c +++ b/epan/dissectors/packet-sap.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-sasp.c b/epan/dissectors/packet-sasp.c index 77266a4670..db2155fae0 100644 --- a/epan/dissectors/packet-sasp.c +++ b/epan/dissectors/packet-sasp.c @@ -23,13 +23,12 @@ #include "config.h" -#include <glib.h> -#include <epan/wmem/wmem.h> + #include <epan/packet.h> #include <epan/expert.h> -#include "packet-tcp.h" #include <epan/prefs.h> #include <epan/to_str.h> +#include "packet-tcp.h" /* forward reference */ void proto_register_sasp(void); diff --git a/epan/dissectors/packet-sbus.c b/epan/dissectors/packet-sbus.c index f70cc2330e..5594d298c4 100644 --- a/epan/dissectors/packet-sbus.c +++ b/epan/dissectors/packet-sbus.c @@ -23,10 +23,8 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> #include <epan/expert.h> void proto_register_sbus(void); diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c index 39e9ebd290..8f91f14400 100644 --- a/epan/dissectors/packet-sccp.c +++ b/epan/dissectors/packet-sccp.c @@ -38,19 +38,15 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/emem.h> -#include <epan/wmem/wmem.h> #include <epan/reassemble.h> #include <epan/asn1.h> #include <epan/uat.h> #include <epan/strutil.h> #include <epan/expert.h> #include <epan/tap.h> -#include <address.h> +#include <epan/address.h> #include <epan/to_str.h> #include <wiretap/wtap.h> #include "packet-mtp3.h" diff --git a/epan/dissectors/packet-sccpmg.c b/epan/dissectors/packet-sccpmg.c index 30baed62b5..d888a5355a 100644 --- a/epan/dissectors/packet-sccpmg.c +++ b/epan/dissectors/packet-sccpmg.c @@ -33,8 +33,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include "packet-mtp3.h" diff --git a/epan/dissectors/packet-scsi-mmc.c b/epan/dissectors/packet-scsi-mmc.c index 791db7aae4..bcef5326d9 100644 --- a/epan/dissectors/packet-scsi-mmc.c +++ b/epan/dissectors/packet-scsi-mmc.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include <epan/conversation.h> diff --git a/epan/dissectors/packet-scsi-osd.c b/epan/dissectors/packet-scsi-osd.c index 49198bd2a4..fc235a4d68 100644 --- a/epan/dissectors/packet-scsi-osd.c +++ b/epan/dissectors/packet-scsi-osd.c @@ -26,9 +26,7 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include <epan/conversation.h> #include <epan/tap.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-scsi-sbc.c b/epan/dissectors/packet-scsi-sbc.c index d6f8244bd0..43a6529dd9 100644 --- a/epan/dissectors/packet-scsi-sbc.c +++ b/epan/dissectors/packet-scsi-sbc.c @@ -36,7 +36,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/conversation.h> #include <epan/tap.h> diff --git a/epan/dissectors/packet-scsi-smc.c b/epan/dissectors/packet-scsi-smc.c index 8c86ffced2..260bf3141b 100644 --- a/epan/dissectors/packet-scsi-smc.c +++ b/epan/dissectors/packet-scsi-smc.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/conversation.h> #include <epan/tap.h> diff --git a/epan/dissectors/packet-scsi-ssc.c b/epan/dissectors/packet-scsi-ssc.c index f54baa5a4a..b113ed9115 100644 --- a/epan/dissectors/packet-scsi-ssc.c +++ b/epan/dissectors/packet-scsi-ssc.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/conversation.h> #include <epan/tap.h> diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c index 40d980b0f1..997cdbba6e 100644 --- a/epan/dissectors/packet-scsi.c +++ b/epan/dissectors/packet-scsi.c @@ -79,12 +79,10 @@ */ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/strutil.h> #include <epan/to_str.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> #include <epan/conversation.h> #include <epan/tap.h> #include <epan/reassemble.h> diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c index 23bddce262..55e3cbb7a3 100644 --- a/epan/dissectors/packet-sctp.c +++ b/epan/dissectors/packet-sctp.c @@ -53,8 +53,8 @@ #include <string.h> -#include <epan/prefs.h> #include <epan/packet.h> +#include <epan/prefs.h> #include <epan/exceptions.h> #include <epan/tap.h> #include <epan/exported_pdu.h> @@ -62,7 +62,6 @@ #include <epan/addr_resolv.h> #include <epan/sctpppids.h> #include <epan/uat.h> -#include <epan/wmem/wmem.h> #include <epan/expert.h> #include <epan/conversation_table.h> #include <epan/show_exception.h> diff --git a/epan/dissectors/packet-sdh.c b/epan/dissectors/packet-sdh.c index 031a68aadf..9adb93cd8c 100644 --- a/epan/dissectors/packet-sdh.c +++ b/epan/dissectors/packet-sdh.c @@ -22,8 +22,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <wiretap/wtap.h> diff --git a/epan/dissectors/packet-sdlc.c b/epan/dissectors/packet-sdlc.c index 21de5db9e3..798ca492c4 100644 --- a/epan/dissectors/packet-sdlc.c +++ b/epan/dissectors/packet-sdlc.c @@ -22,8 +22,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <wiretap/wtap.h> #include <epan/xdlc.h> diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c index a93f6ed897..e03c0049f2 100644 --- a/epan/dissectors/packet-sdp.c +++ b/epan/dissectors/packet-sdp.c @@ -26,12 +26,9 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/strutil.h> -#include <epan/wmem/wmem.h> #include <epan/asn1.h> #include <epan/prefs.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-sebek.c b/epan/dissectors/packet-sebek.c index d9febb83c9..d4fbede2c8 100644 --- a/epan/dissectors/packet-sebek.c +++ b/epan/dissectors/packet-sebek.c @@ -30,8 +30,6 @@ #include <string.h> #include <time.h> #include <math.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/addr_resolv.h> diff --git a/epan/dissectors/packet-selfm.c b/epan/dissectors/packet-selfm.c index b6220a4a84..b4b7176f9c 100644 --- a/epan/dissectors/packet-selfm.c +++ b/epan/dissectors/packet-selfm.c @@ -64,7 +64,6 @@ #include <epan/reassemble.h> #include <epan/expert.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> #include <epan/crc16-tvb.h> #include "packet-rtacser.h" diff --git a/epan/dissectors/packet-sercosiii.c b/epan/dissectors/packet-sercosiii.c index 53f9095974..794787737b 100644 --- a/epan/dissectors/packet-sercosiii.c +++ b/epan/dissectors/packet-sercosiii.c @@ -31,8 +31,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-ses.c b/epan/dissectors/packet-ses.c index 02e6bf32d7..730850159e 100644 --- a/epan/dissectors/packet-ses.c +++ b/epan/dissectors/packet-ses.c @@ -25,9 +25,6 @@ #include "config.h" -#include <glib.h> - -#include <epan/wmem/wmem.h> #include <epan/packet.h> #include <epan/expert.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-sflow.c b/epan/dissectors/packet-sflow.c index 47759b58ad..4c89a65704 100644 --- a/epan/dissectors/packet-sflow.c +++ b/epan/dissectors/packet-sflow.c @@ -49,8 +49,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-sgsap.c b/epan/dissectors/packet-sgsap.c index 7751d9a4a2..6c519d5cef 100644 --- a/epan/dissectors/packet-sgsap.c +++ b/epan/dissectors/packet-sgsap.c @@ -26,7 +26,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/asn1.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-sigcomp.c b/epan/dissectors/packet-sigcomp.c index cfc10f4eec..468e4e6609 100644 --- a/epan/dissectors/packet-sigcomp.c +++ b/epan/dissectors/packet-sigcomp.c @@ -31,14 +31,11 @@ #include "config.h" #include <math.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/strutil.h> #include <epan/expert.h> #include <epan/to_str.h> -#include <epan/wmem/wmem.h> #include <epan/sigcomp-udvm.h> #include <epan/sigcomp_state_hdlr.h> diff --git a/epan/dissectors/packet-simulcrypt.c b/epan/dissectors/packet-simulcrypt.c index 878e81f6a3..86d715864a 100644 --- a/epan/dissectors/packet-simulcrypt.c +++ b/epan/dissectors/packet-simulcrypt.c @@ -32,10 +32,9 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> -#include <epan/dissectors/packet-tcp.h> #include <epan/prefs.h> +#include "packet-tcp.h" #define PROTO_TAG_SIMULCRYPT "SIMULCRYPT" #define CA_SYSTEM_ID_MIKEY 0x9999 /* CA_system_ID corresponding to MIKEY ECM */ diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c index 063ac4e60f..97f3a44e01 100644 --- a/epan/dissectors/packet-sip.c +++ b/epan/dissectors/packet-sip.c @@ -33,13 +33,10 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/prefs.h> #include <epan/req_resp_hdrs.h> -#include <epan/wmem/wmem.h> #include <epan/strutil.h> #include <epan/tap.h> #include <epan/exported_pdu.h> diff --git a/epan/dissectors/packet-sita.c b/epan/dissectors/packet-sita.c index c7fae052da..ccd46f15ff 100644 --- a/epan/dissectors/packet-sita.c +++ b/epan/dissectors/packet-sita.c @@ -29,12 +29,8 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <wiretap/wtap.h> -#include <epan/wmem/wmem.h> - void proto_register_sita(void); void proto_reg_handoff_sita(void); diff --git a/epan/dissectors/packet-skype.c b/epan/dissectors/packet-skype.c index 97d1e6774e..02d6aa0370 100644 --- a/epan/dissectors/packet-skype.c +++ b/epan/dissectors/packet-skype.c @@ -40,8 +40,6 @@ #include "config.h" -#include <glib.h> -#include <epan/wmem/wmem.h> #include <epan/packet.h> #include <epan/conversation.h> diff --git a/epan/dissectors/packet-slimp3.c b/epan/dissectors/packet-slimp3.c index 74d030da15..7d3f3d82e6 100644 --- a/epan/dissectors/packet-slimp3.c +++ b/epan/dissectors/packet-slimp3.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <string.h> #include <epan/packet.h> #include <epan/to_str.h> diff --git a/epan/dissectors/packet-sll.c b/epan/dissectors/packet-sll.c index a6fef766b3..a8d2418024 100644 --- a/epan/dissectors/packet-sll.c +++ b/epan/dissectors/packet-sll.c @@ -24,8 +24,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/arptypes.h> #include <wsutil/pint.h> diff --git a/epan/dissectors/packet-slowprotocols.c b/epan/dissectors/packet-slowprotocols.c index 16837d165f..79944a6679 100644 --- a/epan/dissectors/packet-slowprotocols.c +++ b/epan/dissectors/packet-slowprotocols.c @@ -29,8 +29,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/etypes.h> #include <epan/slow_protocol_subtypes.h> diff --git a/epan/dissectors/packet-slsk.c b/epan/dissectors/packet-slsk.c index 5c137b7ec3..832f03d366 100644 --- a/epan/dissectors/packet-slsk.c +++ b/epan/dissectors/packet-slsk.c @@ -32,8 +32,6 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-smb-browse.c b/epan/dissectors/packet-smb-browse.c index 2243d581d0..6f8a00c36a 100644 --- a/epan/dissectors/packet-smb-browse.c +++ b/epan/dissectors/packet-smb-browse.c @@ -27,12 +27,10 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/to_str.h> -#include <epan/dissectors/packet-smb.h> +#include "packet-smb.h" #include "packet-smb-browse.h" #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-smb-common.c b/epan/dissectors/packet-smb-common.c index 6f94d1a262..0d79e7478f 100644 --- a/epan/dissectors/packet-smb-common.c +++ b/epan/dissectors/packet-smb-common.c @@ -25,10 +25,7 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include <epan/strutil.h> #include "packet-smb-common.h" diff --git a/epan/dissectors/packet-smb-direct.c b/epan/dissectors/packet-smb-direct.c index 34523a6f88..4d11284777 100644 --- a/epan/dissectors/packet-smb-direct.c +++ b/epan/dissectors/packet-smb-direct.c @@ -26,8 +26,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/reassemble.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-smb-logon.c b/epan/dissectors/packet-smb-logon.c index 6e7db17af4..b4cd9820a8 100644 --- a/epan/dissectors/packet-smb-logon.c +++ b/epan/dissectors/packet-smb-logon.c @@ -25,8 +25,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include "packet-windows-common.h" #include "packet-smb-common.h" diff --git a/epan/dissectors/packet-smb-mailslot.c b/epan/dissectors/packet-smb-mailslot.c index 12db7fa641..48f218d134 100644 --- a/epan/dissectors/packet-smb-mailslot.c +++ b/epan/dissectors/packet-smb-mailslot.c @@ -27,10 +27,8 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> -#include <epan/dissectors/packet-smb.h> +#include "packet-smb.h" #include "packet-smb-mailslot.h" #include "packet-smb-browse.h" #include "packet-smb-pipe.h" diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c index 92371c2af9..c67152ff42 100644 --- a/epan/dissectors/packet-smb-pipe.c +++ b/epan/dissectors/packet-smb-pipe.c @@ -33,19 +33,17 @@ XXX Fixme : shouldn't show [malformed frame] for long packets #include <time.h> #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/to_str.h> #include <epan/expert.h> -#include <epan/dissectors/packet-smb.h> +#include <epan/reassemble.h> +#include "packet-smb.h" #include "packet-smb-pipe.h" #include "packet-smb-browse.h" #include "packet-smb-common.h" #include "packet-windows-common.h" #include "packet-dcerpc.h" -#include <epan/reassemble.h> void proto_register_pipe_lanman(void); void proto_register_pipe_dcerpc(void); diff --git a/epan/dissectors/packet-smb-sidsnooping.c b/epan/dissectors/packet-smb-sidsnooping.c index 58ccf9dbae..15dbd290aa 100644 --- a/epan/dissectors/packet-smb-sidsnooping.c +++ b/epan/dissectors/packet-smb-sidsnooping.c @@ -25,16 +25,14 @@ #include <stdio.h> #include <string.h> -#include <epan/packet_info.h> + +#include <epan/packet.h> #include <epan/epan_dissect.h> -#include <epan/proto.h> #include <epan/tap.h> -#include <epan/emem.h> #include <epan/strutil.h> #include "packet-dcerpc.h" #include "packet-dcerpc-nt.h" -#include "register.h" -#include <epan/dissectors/packet-smb.h> +#include "packet-smb.h" #include "packet-smb-sidsnooping.h" void proto_register_smb_sidsnooping(void); diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index 70ec8335d9..6664b2958b 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -26,13 +26,9 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> -#include <epan/dissectors/packet-smb.h> #include <epan/strutil.h> #include <epan/prefs.h> #include <epan/reassemble.h> @@ -40,10 +36,10 @@ #include <epan/expert.h> #include <epan/to_str.h> +#include "packet-windows-common.h" +#include "packet-smb.h" #include "packet-ipx.h" #include "packet-idp.h" - -#include "packet-windows-common.h" #include "packet-smb.h" #include "packet-smb-common.h" #include "packet-smb-mailslot.h" diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index 062fce8a77..0e8800f807 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -30,27 +30,26 @@ #include "config.h" +#include <string.h> + #include <epan/packet.h> +#include <epan/prefs.h> #include <epan/expert.h> #include <epan/conversation.h> #include <epan/tap.h> -#include <epan/wmem/wmem.h> #include <epan/aftypes.h> #include <epan/to_str.h> +#include <epan/asn1.h> #include "packet-smb2.h" #include "packet-dcerpc.h" #include "packet-ntlmssp.h" -#include <epan/asn1.h> #include "packet-kerberos.h" #include "packet-windows-common.h" #include "packet-smb-common.h" #include "packet-smb.h" #include "packet-dcerpc-nt.h" -#include <string.h> -#include <epan/prefs.h> -#include <glib.h> /* Use libgcrypt for cipher libraries. */ #ifdef HAVE_LIBGCRYPT #include <wsutil/wsgcrypt.h> diff --git a/epan/dissectors/packet-smcr.c b/epan/dissectors/packet-smcr.c index 073e9bebdc..2c745bed8c 100644 --- a/epan/dissectors/packet-smcr.c +++ b/epan/dissectors/packet-smcr.c @@ -29,8 +29,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/etypes.h> #include <epan/conversation.h> diff --git a/epan/dissectors/packet-sml.c b/epan/dissectors/packet-sml.c index d92c56491e..e249a482d8 100644 --- a/epan/dissectors/packet-sml.c +++ b/epan/dissectors/packet-sml.c @@ -30,7 +30,6 @@ Short description of the SML protocol on the SML Wireshark Wiki page: http://wi */ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> #include <epan/crc16-tvb.h> diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c index f5ee60cae6..bd4e00ce3e 100644 --- a/epan/dissectors/packet-smpp.c +++ b/epan/dissectors/packet-smpp.c @@ -53,15 +53,12 @@ #include <string.h> #include <time.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/tap.h> #include <epan/stats_tree.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> #include "packet-tcp.h" #include "packet-smpp.h" diff --git a/epan/dissectors/packet-smtp.c b/epan/dissectors/packet-smtp.c index c59757b075..98b3e2402c 100644 --- a/epan/dissectors/packet-smtp.c +++ b/epan/dissectors/packet-smtp.c @@ -29,16 +29,13 @@ #include <stdlib.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/conversation.h> #include <epan/prefs.h> #include <epan/strutil.h> -#include <epan/wmem/wmem.h> #include <epan/reassemble.h> #include <wsutil/base64.h> -#include <epan/dissectors/packet-ssl.h> +#include "packet-ssl.h" /* RFC 2821 */ #define TCP_PORT_SMTP 25 diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c index b41f1e56fc..381b395b7b 100644 --- a/epan/dissectors/packet-sna.c +++ b/epan/dissectors/packet-sna.c @@ -24,7 +24,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/llcsaps.h> #include <epan/ppptypes.h> diff --git a/epan/dissectors/packet-snaeth.c b/epan/dissectors/packet-snaeth.c index 5fa81756e3..e64ef1bf6b 100644 --- a/epan/dissectors/packet-snaeth.c +++ b/epan/dissectors/packet-snaeth.c @@ -22,7 +22,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-sndcp-xid.c b/epan/dissectors/packet-sndcp-xid.c index 218bf7a2a7..ab67186841 100644 --- a/epan/dissectors/packet-sndcp-xid.c +++ b/epan/dissectors/packet-sndcp-xid.c @@ -24,8 +24,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> diff --git a/epan/dissectors/packet-sndcp.c b/epan/dissectors/packet-sndcp.c index e8b3a7125e..05a44901c3 100644 --- a/epan/dissectors/packet-sndcp.c +++ b/epan/dissectors/packet-sndcp.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/reassemble.h> diff --git a/epan/dissectors/packet-socketcan.c b/epan/dissectors/packet-socketcan.c index d464df3f5e..83c2b49828 100644 --- a/epan/dissectors/packet-socketcan.c +++ b/epan/dissectors/packet-socketcan.c @@ -27,10 +27,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <prefs.h> +#include <epan/prefs.h> #include <wiretap/wtap.h> #include "packet-sll.h" diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c index 81f45e3147..3f2d16dcc6 100644 --- a/epan/dissectors/packet-socks.c +++ b/epan/dissectors/packet-socks.c @@ -59,8 +59,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/conversation.h> @@ -69,8 +67,6 @@ #include "packet-udp.h" #include <epan/strutil.h> -#include <epan/wmem/wmem.h> - #define TCP_PORT_SOCKS 1080 diff --git a/epan/dissectors/packet-soupbintcp.c b/epan/dissectors/packet-soupbintcp.c index 0c8f13659c..ffef35dca2 100644 --- a/epan/dissectors/packet-soupbintcp.c +++ b/epan/dissectors/packet-soupbintcp.c @@ -56,11 +56,9 @@ #include <stdlib.h> -#include <epan/conversation.h> #include <epan/packet.h> +#include <epan/conversation.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> - /* For tcp_dissect_pdus() */ #include "packet-tcp.h" diff --git a/epan/dissectors/packet-spdy.c b/epan/dissectors/packet-spdy.c index 427f35c578..cf273169d9 100644 --- a/epan/dissectors/packet-spdy.c +++ b/epan/dissectors/packet-spdy.c @@ -34,16 +34,13 @@ #include "config.h" -#include <glib.h> -#include <epan/conversation.h> #include <epan/packet.h> -#include <epan/wmem/wmem.h> - -#include <epan/dissectors/packet-tcp.h> -#include <epan/dissectors/packet-ssl.h> +#include <epan/conversation.h> #include <epan/prefs.h> #include <epan/expert.h> #include <epan/tap.h> +#include "packet-tcp.h" +#include "packet-ssl.h" #ifdef HAVE_LIBZ #include <zlib.h> diff --git a/epan/dissectors/packet-spice.c b/epan/dissectors/packet-spice.c index 5e7a39b00b..d0de8d8592 100644 --- a/epan/dissectors/packet-spice.c +++ b/epan/dissectors/packet-spice.c @@ -28,13 +28,9 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/conversation.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> - /* NOTE: * packet-spice.h is auto-generated from a Spice protocol definition by a tool * included in the spice-common repository diff --git a/epan/dissectors/packet-spp.c b/epan/dissectors/packet-spp.c index 96a50837b4..0792f3494d 100644 --- a/epan/dissectors/packet-spp.c +++ b/epan/dissectors/packet-spp.c @@ -23,7 +23,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-idp.h" diff --git a/epan/dissectors/packet-spray.c b/epan/dissectors/packet-spray.c index f205319f50..82bdce3c55 100644 --- a/epan/dissectors/packet-spray.c +++ b/epan/dissectors/packet-spray.c @@ -22,8 +22,6 @@ #include "config.h" - - #include "packet-rpc.h" #include "packet-spray.h" diff --git a/epan/dissectors/packet-sprt.c b/epan/dissectors/packet-sprt.c index 22d6f8d600..d99b14230a 100644 --- a/epan/dissectors/packet-sprt.c +++ b/epan/dissectors/packet-sprt.c @@ -33,14 +33,10 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/conversation.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> - #include "packet-sprt.h" void proto_register_sprt(void); diff --git a/epan/dissectors/packet-srp.c b/epan/dissectors/packet-srp.c index 7a5d1bd0e2..97a21f24e0 100644 --- a/epan/dissectors/packet-srp.c +++ b/epan/dissectors/packet-srp.c @@ -23,7 +23,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/circuit.h> #include <epan/stream.h> diff --git a/epan/dissectors/packet-srvloc.c b/epan/dissectors/packet-srvloc.c index 1483aef0b5..2b6d322b2b 100644 --- a/epan/dissectors/packet-srvloc.c +++ b/epan/dissectors/packet-srvloc.c @@ -39,12 +39,9 @@ #include <string.h> #include <time.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/strutil.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> #include "packet-tcp.h" #include <epan/expert.h> diff --git a/epan/dissectors/packet-sscf-nni.c b/epan/dissectors/packet-sscf-nni.c index c25f35d682..168bd8d257 100644 --- a/epan/dissectors/packet-sscf-nni.c +++ b/epan/dissectors/packet-sscf-nni.c @@ -25,7 +25,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> void proto_register_sscf(void); diff --git a/epan/dissectors/packet-sscop.c b/epan/dissectors/packet-sscop.c index de94c8dffe..282d5dfda9 100644 --- a/epan/dissectors/packet-sscop.c +++ b/epan/dissectors/packet-sscop.c @@ -24,9 +24,8 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> -#include <prefs.h> +#include <epan/prefs.h> #include "packet-sscop.h" void proto_register_sscop(void); diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c index 77fbc645d6..17bcc8c5cb 100644 --- a/epan/dissectors/packet-ssh.c +++ b/epan/dissectors/packet-ssh.c @@ -49,12 +49,9 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> #include <epan/sctpppids.h> #include <epan/prefs.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index 5a5cb228fa..66c96879ca 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -31,19 +31,19 @@ #endif #include <stdlib.h> -#include "packet-ssl-utils.h" -#include "packet-ssl.h" -#include <epan/emem.h> +#include <epan/packet.h> #include <epan/strutil.h> #include <epan/addr_resolv.h> #include <epan/ipv6-utils.h> #include <epan/expert.h> #include <epan/asn1.h> -#include <epan/dissectors/packet-x509af.h> -#include "packet-x509if.h" #include <wsutil/file_util.h> #include <wsutil/str_util.h> +#include "packet-x509af.h" +#include "packet-x509if.h" +#include "packet-ssl-utils.h" +#include "packet-ssl.h" /* * Lookup tables diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index becb4272d8..487c00cb21 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -83,26 +83,22 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/conversation.h> #include <epan/reassemble.h> #include <epan/prefs.h> -#include <epan/emem.h> -#include <epan/wmem/wmem.h> -#include <epan/dissectors/packet-tcp.h> #include <epan/asn1.h> -#include <epan/dissectors/packet-x509af.h> -#include <epan/dissectors/packet-ocsp.h> #include <epan/tap.h> -#include <wsutil/filesystem.h> #include <epan/expert.h> -#include "packet-ssl.h" -#include "packet-ssl-utils.h" -#include <wsutil/file_util.h> #include <epan/uat.h> #include <epan/exported_pdu.h> +#include <wsutil/filesystem.h> +#include <wsutil/file_util.h> +#include "packet-tcp.h" +#include "packet-x509af.h" +#include "packet-ocsp.h" +#include "packet-ssl.h" +#include "packet-ssl-utils.h" void proto_register_ssl(void); diff --git a/epan/dissectors/packet-stanag4607.c b/epan/dissectors/packet-stanag4607.c index d6ec05b70b..0898558201 100644 --- a/epan/dissectors/packet-stanag4607.c +++ b/epan/dissectors/packet-stanag4607.c @@ -19,11 +19,8 @@ #include "config.h" #include <math.h> -#include <glib.h> - -#include <epan/expert.h> #include <epan/packet.h> -#include <epan/proto.h> +#include <epan/expert.h> #include <wiretap/stanag4607.h> diff --git a/epan/dissectors/packet-starteam.c b/epan/dissectors/packet-starteam.c index 0de2f87e9c..308b53e138 100644 --- a/epan/dissectors/packet-starteam.c +++ b/epan/dissectors/packet-starteam.c @@ -29,7 +29,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/conversation.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-stat-notify.c b/epan/dissectors/packet-stat-notify.c index 35d9467bbd..d488b76317 100644 --- a/epan/dissectors/packet-stat-notify.c +++ b/epan/dissectors/packet-stat-notify.c @@ -23,7 +23,6 @@ #include "config.h" - #include "packet-rpc.h" #include "packet-stat-notify.h" diff --git a/epan/dissectors/packet-stun.c b/epan/dissectors/packet-stun.c index 90f99db1c8..f7cdecdefc 100644 --- a/epan/dissectors/packet-stun.c +++ b/epan/dissectors/packet-stun.c @@ -41,15 +41,12 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/to_str.h> #include <epan/conversation.h> #include <epan/ipproto.h> -#include <epan/wmem/wmem.h> -#include <packet-tcp.h> -#include <packet-udp.h> +#include "packet-tcp.h" +#include "packet-udp.h" void proto_register_stun(void); void proto_reg_handoff_stun(void); diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c index 671cd908b8..c92877c5a2 100644 --- a/epan/dissectors/packet-sua.c +++ b/epan/dissectors/packet-sua.c @@ -38,8 +38,6 @@ #include "packet-mtp3.h" #include "packet-sccp.h" -#include <epan/wmem/wmem.h> - void proto_register_sua(void); void proto_reg_handoff_sua(void); diff --git a/epan/dissectors/packet-symantec.c b/epan/dissectors/packet-symantec.c index 4723a7d49e..94dc8c7009 100644 --- a/epan/dissectors/packet-symantec.c +++ b/epan/dissectors/packet-symantec.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <wiretap/wtap.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-sync.c b/epan/dissectors/packet-sync.c index df2913b40c..9dbd31447b 100644 --- a/epan/dissectors/packet-sync.c +++ b/epan/dissectors/packet-sync.c @@ -25,8 +25,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include <epan/crc6-tvb.h> diff --git a/epan/dissectors/packet-synergy.c b/epan/dissectors/packet-synergy.c index 14eb00cc69..667d9dd0ec 100644 --- a/epan/dissectors/packet-synergy.c +++ b/epan/dissectors/packet-synergy.c @@ -25,8 +25,6 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> void proto_register_synergy(void); diff --git a/epan/dissectors/packet-synphasor.c b/epan/dissectors/packet-synphasor.c index 835cbed00b..f3567a07fd 100644 --- a/epan/dissectors/packet-synphasor.c +++ b/epan/dissectors/packet-synphasor.c @@ -24,17 +24,15 @@ #include "config.h" -#include <glib.h> +#include <math.h> + +#include <epan/packet.h> #include <epan/conversation.h> #include <epan/crc16-tvb.h> -#include <epan/packet.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> #include "packet-tcp.h" #include "packet-rtacser.h" -#include <math.h> - #define PROTOCOL_NAME "IEEE C37.118 Synchrophasor Protocol" #define PROTOCOL_SHORT_NAME "SYNCHROPHASOR" #define PROTOCOL_ABBREV "synphasor" diff --git a/epan/dissectors/packet-sysex.c b/epan/dissectors/packet-sysex.c index 46a62b5465..3f6b4caaa0 100644 --- a/epan/dissectors/packet-sysex.c +++ b/epan/dissectors/packet-sysex.c @@ -21,13 +21,10 @@ #include "config.h" -#include <glib.h> +#include <epan/packet.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> #include <epan/expert.h> -#include <epan/packet.h> #include <epan/reassemble.h> -#include <epan/tfs.h> void proto_register_sysex(void); diff --git a/epan/dissectors/packet-syslog.c b/epan/dissectors/packet-syslog.c index c9bc3c2ee4..034e8893cf 100644 --- a/epan/dissectors/packet-syslog.c +++ b/epan/dissectors/packet-syslog.c @@ -30,8 +30,6 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-t30.c b/epan/dissectors/packet-t30.c index 5583ee918f..abb249ac0a 100644 --- a/epan/dissectors/packet-t30.c +++ b/epan/dissectors/packet-t30.c @@ -23,13 +23,11 @@ #include "config.h" -#include <glib.h> -#include <glib/gprintf.h> - #include <string.h> +#include <glib/gprintf.h> + #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include <epan/expert.h> #include "packet-t38.h" diff --git a/epan/dissectors/packet-tacacs.c b/epan/dissectors/packet-tacacs.c index 18505839cd..59f830c437 100644 --- a/epan/dissectors/packet-tacacs.c +++ b/epan/dissectors/packet-tacacs.c @@ -34,15 +34,11 @@ #include "config.h" -#include <glib.h> - -#include <wsutil/md5.h> - #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> #include <epan/expert.h> #include <epan/addr_resolv.h> +#include <wsutil/md5.h> #include "packet-tacacs.h" diff --git a/epan/dissectors/packet-tali.c b/epan/dissectors/packet-tali.c index 2420e3d3f5..8619d950c2 100644 --- a/epan/dissectors/packet-tali.c +++ b/epan/dissectors/packet-tali.c @@ -35,8 +35,6 @@ #include "config.h" #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include "packet-tcp.h" diff --git a/epan/dissectors/packet-tapa.c b/epan/dissectors/packet-tapa.c index dd8e3ac21a..2a897f0d6d 100644 --- a/epan/dissectors/packet-tapa.c +++ b/epan/dissectors/packet-tapa.c @@ -32,7 +32,6 @@ Specs: #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/to_str.h> #include <epan/ipproto.h> diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index 5f3503f69e..ee98e65b4f 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -24,8 +24,6 @@ #include <stdio.h> #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/addr_resolv.h> @@ -34,7 +32,6 @@ #include <epan/ip_opts.h> #include <epan/follow.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> #include <epan/show_exception.h> #include <epan/conversation.h> #include <epan/conversation_table.h> diff --git a/epan/dissectors/packet-tdmoe.c b/epan/dissectors/packet-tdmoe.c index c209257f09..9e9ebe57ba 100644 --- a/epan/dissectors/packet-tdmoe.c +++ b/epan/dissectors/packet-tdmoe.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/etypes.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c index 2be96a09bd..7ef2e96ec7 100644 --- a/epan/dissectors/packet-tds.c +++ b/epan/dissectors/packet-tds.c @@ -146,8 +146,6 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/conversation.h> @@ -155,7 +153,6 @@ #include <epan/show_exception.h> #include <epan/reassemble.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> #include <epan/expert.h> #define TDS_QUERY_PKT 1 diff --git a/epan/dissectors/packet-teamspeak2.c b/epan/dissectors/packet-teamspeak2.c index 7a613fed76..ab738bcdcf 100644 --- a/epan/dissectors/packet-teamspeak2.c +++ b/epan/dissectors/packet-teamspeak2.c @@ -24,12 +24,9 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <wsutil/crc32.h> #include <epan/crc32-tvb.h> -#include <epan/wmem/wmem.h> #include <epan/reassemble.h> #include <epan/conversation.h> diff --git a/epan/dissectors/packet-teimanagement.c b/epan/dissectors/packet-teimanagement.c index 536125f676..76173f4178 100644 --- a/epan/dissectors/packet-teimanagement.c +++ b/epan/dissectors/packet-teimanagement.c @@ -24,7 +24,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/lapd_sapi.h> diff --git a/epan/dissectors/packet-telkonet.c b/epan/dissectors/packet-telkonet.c index 7eca87ef20..c96fc5f234 100644 --- a/epan/dissectors/packet-telkonet.c +++ b/epan/dissectors/packet-telkonet.c @@ -31,7 +31,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-telnet.c b/epan/dissectors/packet-telnet.c index 97ea944f28..a5cfc926ca 100644 --- a/epan/dissectors/packet-telnet.c +++ b/epan/dissectors/packet-telnet.c @@ -28,11 +28,8 @@ #include <stdlib.h> #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> #include <epan/asn1.h> #include "packet-kerberos.h" #include "packet-tn3270.h" diff --git a/epan/dissectors/packet-teredo.c b/epan/dissectors/packet-teredo.c index f4d211a664..53f4422f8c 100644 --- a/epan/dissectors/packet-teredo.c +++ b/epan/dissectors/packet-teredo.c @@ -27,8 +27,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/addr_resolv.h> #include <epan/ipproto.h> diff --git a/epan/dissectors/packet-text-media.c b/epan/dissectors/packet-text-media.c index 97cdf61e41..4ad296a904 100644 --- a/epan/dissectors/packet-text-media.c +++ b/epan/dissectors/packet-text-media.c @@ -32,8 +32,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> diff --git a/epan/dissectors/packet-tfp.c b/epan/dissectors/packet-tfp.c index df51794098..bc5e1d305a 100644 --- a/epan/dissectors/packet-tfp.c +++ b/epan/dissectors/packet-tfp.c @@ -24,9 +24,8 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> -#include <epan/dissectors/packet-usb.h> +#include "packet-usb.h" /* defines */ #define tfp_PORT 4223 diff --git a/epan/dissectors/packet-tftp.c b/epan/dissectors/packet-tftp.c index 2fd1b869cb..dd8cd49fdd 100644 --- a/epan/dissectors/packet-tftp.c +++ b/epan/dissectors/packet-tftp.c @@ -40,11 +40,9 @@ #include "config.h" -#include <glib.h> #include <stdlib.h> #include <epan/packet.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> #include <epan/expert.h> #include <epan/range.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-tipc.c b/epan/dissectors/packet-tipc.c index 36814259f6..4ecb4474f0 100644 --- a/epan/dissectors/packet-tipc.c +++ b/epan/dissectors/packet-tipc.c @@ -30,13 +30,10 @@ #include "config.h" -#include <epan/prefs.h> - -#include <glib.h> #include <epan/packet.h> +#include <epan/prefs.h> #include <epan/expert.h> #include <epan/etypes.h> -#include <epan/wmem/wmem.h> #include <epan/reassemble.h> #include "packet-tcp.h" diff --git a/epan/dissectors/packet-tivoconnect.c b/epan/dissectors/packet-tivoconnect.c index 132e81cc3b..e6ac03c4ad 100644 --- a/epan/dissectors/packet-tivoconnect.c +++ b/epan/dissectors/packet-tivoconnect.c @@ -39,8 +39,6 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> /* Forward declaration we need below */ diff --git a/epan/dissectors/packet-tn3270.c b/epan/dissectors/packet-tn3270.c index e4d4babb26..b25c0f837d 100644 --- a/epan/dissectors/packet-tn3270.c +++ b/epan/dissectors/packet-tn3270.c @@ -47,11 +47,8 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/address.h> -#include <epan/wmem/wmem.h> #include <epan/conversation.h> #include <epan/strutil.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-tn5250.c b/epan/dissectors/packet-tn5250.c index f84cb534ca..3b6d760697 100644 --- a/epan/dissectors/packet-tn5250.c +++ b/epan/dissectors/packet-tn5250.c @@ -31,11 +31,9 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include <epan/address.h> -#include <wmem/wmem.h> #include <epan/conversation.h> #include "packet-tn5250.h" diff --git a/epan/dissectors/packet-tnef.c b/epan/dissectors/packet-tnef.c index c239db5e82..9e237f7524 100644 --- a/epan/dissectors/packet-tnef.c +++ b/epan/dissectors/packet-tnef.c @@ -24,8 +24,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/addr_resolv.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-tns.c b/epan/dissectors/packet-tns.c index e1b3d188ee..0a96835d42 100644 --- a/epan/dissectors/packet-tns.c +++ b/epan/dissectors/packet-tns.c @@ -24,7 +24,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-tcp.h" #include "packet-tns.h" diff --git a/epan/dissectors/packet-tpkt.c b/epan/dissectors/packet-tpkt.c index e4e4f54bfe..feac15b7b2 100644 --- a/epan/dissectors/packet-tpkt.c +++ b/epan/dissectors/packet-tpkt.c @@ -28,8 +28,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-tpncp.c b/epan/dissectors/packet-tpncp.c index b9a93072be..ae535e04ca 100644 --- a/epan/dissectors/packet-tpncp.c +++ b/epan/dissectors/packet-tpncp.c @@ -30,18 +30,14 @@ #include <stdlib.h> #include <string.h> -#include <glib.h> - -#include <wsutil/file_util.h> - -#include <epan/exceptions.h> #include <epan/packet.h> +#include <epan/exceptions.h> #include <epan/prefs.h> -#include <epan/emem.h> -#include <wsutil/filesystem.h> -#include <epan/dissectors/packet-tcp.h> #include <epan/strutil.h> #include <epan/to_str.h> +#include <wsutil/filesystem.h> +#include <wsutil/file_util.h> +#include "packet-tcp.h" /*-------------------------------------------------------------------------------------------------------------------------------------------*/ diff --git a/epan/dissectors/packet-tr.c b/epan/dissectors/packet-tr.c index 83afb858ca..f2100e492d 100644 --- a/epan/dissectors/packet-tr.c +++ b/epan/dissectors/packet-tr.c @@ -24,7 +24,6 @@ #include "config.h" #include <string.h> -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include <epan/exceptions.h> @@ -36,8 +35,6 @@ #include <epan/prefs.h> #include <wiretap/wtap.h> #include <epan/tap.h> -#include <epan/wmem/wmem.h> - void proto_register_tr(void); void proto_reg_handoff_tr(void); diff --git a/epan/dissectors/packet-trill.c b/epan/dissectors/packet-trill.c index 741d7c4434..98ab5339cc 100644 --- a/epan/dissectors/packet-trill.c +++ b/epan/dissectors/packet-trill.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-trmac.c b/epan/dissectors/packet-trmac.c index be98474d54..258cdb6920 100644 --- a/epan/dissectors/packet-trmac.c +++ b/epan/dissectors/packet-trmac.c @@ -24,7 +24,6 @@ #include "config.h" #include <string.h> -#include <glib.h> #include <epan/packet.h> #include <epan/to_str.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-tsp.c b/epan/dissectors/packet-tsp.c index 6f62dfb08d..bd4f2ba745 100644 --- a/epan/dissectors/packet-tsp.c +++ b/epan/dissectors/packet-tsp.c @@ -26,7 +26,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> /* diff --git a/epan/dissectors/packet-tte-pcf.c b/epan/dissectors/packet-tte-pcf.c index 4238f006b4..20d98d81ee 100644 --- a/epan/dissectors/packet-tte-pcf.c +++ b/epan/dissectors/packet-tte-pcf.c @@ -29,8 +29,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-tte.c b/epan/dissectors/packet-tte.c index c8b0d64682..71a4b98772 100644 --- a/epan/dissectors/packet-tte.c +++ b/epan/dissectors/packet-tte.c @@ -29,8 +29,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-turbocell.c b/epan/dissectors/packet-turbocell.c index 3ef1e5fc55..ccc0a5faa1 100644 --- a/epan/dissectors/packet-turbocell.c +++ b/epan/dissectors/packet-turbocell.c @@ -35,8 +35,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-turnchannel.c b/epan/dissectors/packet-turnchannel.c index 985b473c66..7599bb80a7 100644 --- a/epan/dissectors/packet-turnchannel.c +++ b/epan/dissectors/packet-turnchannel.c @@ -31,10 +31,8 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <packet-tcp.h> +#include "packet-tcp.h" void proto_register_turnchannel(void); void proto_reg_handoff_turnchannel(void); diff --git a/epan/dissectors/packet-tuxedo.c b/epan/dissectors/packet-tuxedo.c index 8d4cda3a6f..ba7bcf2f15 100644 --- a/epan/dissectors/packet-tuxedo.c +++ b/epan/dissectors/packet-tuxedo.c @@ -24,7 +24,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/conversation.h> diff --git a/epan/dissectors/packet-tzsp.c b/epan/dissectors/packet-tzsp.c index 819122cc37..f4dc908d7e 100644 --- a/epan/dissectors/packet-tzsp.c +++ b/epan/dissectors/packet-tzsp.c @@ -26,8 +26,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <wiretap/wtap.h> diff --git a/epan/dissectors/packet-ua.c b/epan/dissectors/packet-ua.c index a85db6f1a5..cb73df64f8 100644 --- a/epan/dissectors/packet-ua.c +++ b/epan/dissectors/packet-ua.c @@ -23,14 +23,11 @@ #include "config.h" -#include <glib.h> - -#include "epan/packet.h" -#include "epan/prefs.h" - -#include "epan/dissectors/packet-rtp.h" -#include "epan/dissectors/packet-rtcp.h" +#include <epan/packet.h> +#include <epan/prefs.h> +#include "packet-rtp.h" +#include "packet-rtcp.h" #include "packet-uaudp.h" void proto_register_ua_msg(void); diff --git a/epan/dissectors/packet-ua3g.c b/epan/dissectors/packet-ua3g.c index 884fdf8cf4..30d0fa3bdf 100644 --- a/epan/dissectors/packet-ua3g.c +++ b/epan/dissectors/packet-ua3g.c @@ -23,10 +23,7 @@ #include "config.h" -#include <glib.h> - #include "epan/packet.h" -#include "epan/wmem/wmem.h" #include "packet-uaudp.h" void proto_register_ua3g(void); diff --git a/epan/dissectors/packet-uasip.c b/epan/dissectors/packet-uasip.c index cccee57d83..40f4436d8b 100644 --- a/epan/dissectors/packet-uasip.c +++ b/epan/dissectors/packet-uasip.c @@ -25,8 +25,6 @@ #include <string.h> -#include <glib.h> - #include "epan/packet.h" #include "epan/prefs.h" #include "epan/tap.h" diff --git a/epan/dissectors/packet-uaudp.c b/epan/dissectors/packet-uaudp.c index 67f6931ac8..c000973002 100644 --- a/epan/dissectors/packet-uaudp.c +++ b/epan/dissectors/packet-uaudp.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include "epan/packet.h" #include "epan/prefs.h" #include "epan/tap.h" diff --git a/epan/dissectors/packet-ubertooth.c b/epan/dissectors/packet-ubertooth.c index 638d62c651..ade856aa48 100644 --- a/epan/dissectors/packet-ubertooth.c +++ b/epan/dissectors/packet-ubertooth.c @@ -27,7 +27,6 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> #include <epan/addr_resolv.h> #include "packet-bluetooth.h" diff --git a/epan/dissectors/packet-ucp.c b/epan/dissectors/packet-ucp.c index 1944ef0402..7c8d080e47 100644 --- a/epan/dissectors/packet-ucp.c +++ b/epan/dissectors/packet-ucp.c @@ -36,11 +36,8 @@ #include <stdlib.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> #include <epan/conversation.h> #include <epan/stats_tree.h> diff --git a/epan/dissectors/packet-udld.c b/epan/dissectors/packet-udld.c index d3a1e7cf65..124ed33c7a 100644 --- a/epan/dissectors/packet-udld.c +++ b/epan/dissectors/packet-udld.c @@ -22,8 +22,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-udp.c b/epan/dissectors/packet-udp.c index 704e2f8e43..26c1f3b9a7 100644 --- a/epan/dissectors/packet-udp.c +++ b/epan/dissectors/packet-udp.c @@ -29,10 +29,7 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include <epan/addr_resolv.h> #include <epan/ipproto.h> #include <epan/in_cksum.h> diff --git a/epan/dissectors/packet-udt.c b/epan/dissectors/packet-udt.c index 28dafe5fae..0005c1699d 100644 --- a/epan/dissectors/packet-udt.c +++ b/epan/dissectors/packet-udt.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/conversation.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-uhd.c b/epan/dissectors/packet-uhd.c index a0deea5f0e..07627ce81e 100644 --- a/epan/dissectors/packet-uhd.c +++ b/epan/dissectors/packet-uhd.c @@ -30,7 +30,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-uma.c b/epan/dissectors/packet-uma.c index 5b6e729f31..512fbb13a4 100644 --- a/epan/dissectors/packet-uma.c +++ b/epan/dissectors/packet-uma.c @@ -53,8 +53,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/conversation.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c index 04528e49aa..ca7d20b789 100644 --- a/epan/dissectors/packet-umts_fp.c +++ b/epan/dissectors/packet-umts_fp.c @@ -28,10 +28,8 @@ #include <epan/expert.h> #include <epan/prefs.h> #include <epan/uat.h> -#include <epan/wmem/wmem.h> #include <epan/conversation.h> #include <epan/addr_resolv.h> -#include <glib.h> #include <wsutil/crc7.h> /* For FP data header and control frame CRC. */ #include <wsutil/crc16-plain.h> /* For FP Payload CRC. */ #include <wsutil/crc11.h> /* For FP EDCH header CRC. */ diff --git a/epan/dissectors/packet-umts_mac.c b/epan/dissectors/packet-umts_mac.c index 5a47a393a8..2572111d63 100644 --- a/epan/dissectors/packet-umts_mac.c +++ b/epan/dissectors/packet-umts_mac.c @@ -22,10 +22,7 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include <epan/conversation.h> #include <epan/expert.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-usb-audio.c b/epan/dissectors/packet-usb-audio.c index 34c0be25ff..ae8bb0b476 100644 --- a/epan/dissectors/packet-usb-audio.c +++ b/epan/dissectors/packet-usb-audio.c @@ -24,7 +24,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include <epan/reassemble.h> diff --git a/epan/dissectors/packet-usb-ccid.c b/epan/dissectors/packet-usb-ccid.c index 636d1f834b..e9a063ae02 100644 --- a/epan/dissectors/packet-usb-ccid.c +++ b/epan/dissectors/packet-usb-ccid.c @@ -27,10 +27,9 @@ */ #include "config.h" -#include <glib.h> #include <epan/packet.h> -#include <epan/dissectors/packet-usb.h> #include <epan/prefs.h> +#include "packet-usb.h" static int proto_ccid = -1; diff --git a/epan/dissectors/packet-usb-dfu.c b/epan/dissectors/packet-usb-dfu.c index fe6c565401..73caf3b702 100644 --- a/epan/dissectors/packet-usb-dfu.c +++ b/epan/dissectors/packet-usb-dfu.c @@ -27,8 +27,6 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> - #include "packet-usb.h" static int proto_usb_dfu = -1; diff --git a/epan/dissectors/packet-usb-hid.c b/epan/dissectors/packet-usb-hid.c index 69034e7a3c..a228efd911 100644 --- a/epan/dissectors/packet-usb-hid.c +++ b/epan/dissectors/packet-usb-hid.c @@ -21,9 +21,9 @@ #include "config.h" -#include <glib.h> -#include <epan/packet.h> #include <string.h> + +#include <epan/packet.h> #include "packet-usb.h" #include "packet-usb-hid.h" diff --git a/epan/dissectors/packet-usb-hub.c b/epan/dissectors/packet-usb-hub.c index 9896e842de..7098d83c5f 100644 --- a/epan/dissectors/packet-usb-hub.c +++ b/epan/dissectors/packet-usb-hub.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-usb.h" diff --git a/epan/dissectors/packet-usb-masstorage.c b/epan/dissectors/packet-usb-masstorage.c index 8d5e037f13..920e6d1d60 100644 --- a/epan/dissectors/packet-usb-masstorage.c +++ b/epan/dissectors/packet-usb-masstorage.c @@ -21,9 +21,7 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include "packet-usb.h" #include "packet-scsi.h" diff --git a/epan/dissectors/packet-usb-video.c b/epan/dissectors/packet-usb-video.c index d005477814..f1e1f6a66b 100644 --- a/epan/dissectors/packet-usb-video.c +++ b/epan/dissectors/packet-usb-video.c @@ -23,10 +23,8 @@ #include "config.h" -#include <glib.h> -#include <epan/expert.h> #include <epan/packet.h> -#include <epan/wmem/wmem.h> +#include <epan/expert.h> #include "packet-usb.h" void proto_register_usb_vid(void); diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index db0a080220..8feab0eada 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -24,12 +24,10 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/etypes.h> #include <epan/addr_resolv.h> -#include <epan/wmem/wmem.h> #include <epan/tap.h> #include <epan/conversation.h> #include <epan/conversation_table.h> diff --git a/epan/dissectors/packet-user_encap.c b/epan/dissectors/packet-user_encap.c index 45fc90488b..4f192de3e8 100644 --- a/epan/dissectors/packet-user_encap.c +++ b/epan/dissectors/packet-user_encap.c @@ -25,12 +25,10 @@ #include <stdio.h> -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include <epan/prefs.h> #include <epan/uat.h> -#include <epan/wmem/wmem.h> #include <epan/exported_pdu.h> #include <epan/tap.h> #include <wiretap/wtap.h> diff --git a/epan/dissectors/packet-uts.c b/epan/dissectors/packet-uts.c index 940d73e81d..080f698c0c 100644 --- a/epan/dissectors/packet-uts.c +++ b/epan/dissectors/packet-uts.c @@ -27,8 +27,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <wiretap/wtap.h> diff --git a/epan/dissectors/packet-v120.c b/epan/dissectors/packet-v120.c index e8aea853f7..dad4625fb3 100644 --- a/epan/dissectors/packet-v120.c +++ b/epan/dissectors/packet-v120.c @@ -23,7 +23,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/xdlc.h> diff --git a/epan/dissectors/packet-v150fw.c b/epan/dissectors/packet-v150fw.c index ebd4298259..a6d3a18d70 100644 --- a/epan/dissectors/packet-v150fw.c +++ b/epan/dissectors/packet-v150fw.c @@ -28,8 +28,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> void proto_register_v150fw(void); diff --git a/epan/dissectors/packet-v52.c b/epan/dissectors/packet-v52.c index 649690a30c..cc55d2822e 100644 --- a/epan/dissectors/packet-v52.c +++ b/epan/dissectors/packet-v52.c @@ -32,7 +32,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-v5dl.c b/epan/dissectors/packet-v5dl.c index fa84967c6d..c4d8fb280c 100644 --- a/epan/dissectors/packet-v5dl.c +++ b/epan/dissectors/packet-v5dl.c @@ -32,8 +32,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/xdlc.h> #include <epan/crc16-tvb.h> diff --git a/epan/dissectors/packet-v5ef.c b/epan/dissectors/packet-v5ef.c index 6fbb6f1cb7..90e474ff30 100644 --- a/epan/dissectors/packet-v5ef.c +++ b/epan/dissectors/packet-v5ef.c @@ -31,8 +31,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <wiretap/wtap.h> #include <epan/xdlc.h> diff --git a/epan/dissectors/packet-v5ua.c b/epan/dissectors/packet-v5ua.c index 1851b5d1ec..8bea1f04ae 100644 --- a/epan/dissectors/packet-v5ua.c +++ b/epan/dissectors/packet-v5ua.c @@ -41,8 +41,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/addr_resolv.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-vcdu.c b/epan/dissectors/packet-vcdu.c index 346b9a414a..af1dffe303 100644 --- a/epan/dissectors/packet-vcdu.c +++ b/epan/dissectors/packet-vcdu.c @@ -24,12 +24,10 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include <epan/prefs.h> #include <epan/to_str.h> -#include <epan/wmem/wmem.h> #include <epan/uat.h> void proto_register_vcdu(void); diff --git a/epan/dissectors/packet-vines.c b/epan/dissectors/packet-vines.c index 24bd1cb0db..ca9816e59c 100644 --- a/epan/dissectors/packet-vines.c +++ b/epan/dissectors/packet-vines.c @@ -83,7 +83,6 @@ #include "config.h" #include <string.h> -#include <glib.h> #include <epan/packet.h> #include "packet-vines.h" #include <epan/etypes.h> diff --git a/epan/dissectors/packet-vlan.c b/epan/dissectors/packet-vlan.c index 223f1515d2..5217c6da71 100644 --- a/epan/dissectors/packet-vlan.c +++ b/epan/dissectors/packet-vlan.c @@ -24,7 +24,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <wsutil/pint.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-vmlab.c b/epan/dissectors/packet-vmlab.c index 2c2472ee25..60a3ef754f 100644 --- a/epan/dissectors/packet-vmlab.c +++ b/epan/dissectors/packet-vmlab.c @@ -41,9 +41,8 @@ #include "config.h" -#include <glib.h> -#include <epan/addr_resolv.h> #include <epan/packet.h> +#include <epan/addr_resolv.h> #include <epan/etypes.h> void proto_register_vmlab(void); diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c index 0e3db7872d..47b9da0b90 100644 --- a/epan/dissectors/packet-vnc.c +++ b/epan/dissectors/packet-vnc.c @@ -79,11 +79,8 @@ #include "config.h" -#include <glib.h> - -#include <epan/conversation.h> -#include <epan/wmem/wmem.h> #include <epan/packet.h> +#include <epan/conversation.h> #include <epan/prefs.h> #include <epan/expert.h> #include "packet-x11.h" /* This contains the extern for the X11 value_string_ext diff --git a/epan/dissectors/packet-vntag.c b/epan/dissectors/packet-vntag.c index 348e98572d..d49e5ec69e 100644 --- a/epan/dissectors/packet-vntag.c +++ b/epan/dissectors/packet-vntag.c @@ -21,7 +21,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-vrrp.c b/epan/dissectors/packet-vrrp.c index 70518b067e..56be004d72 100644 --- a/epan/dissectors/packet-vrrp.c +++ b/epan/dissectors/packet-vrrp.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/ipproto.h> #include <epan/in_cksum.h> diff --git a/epan/dissectors/packet-vtp.c b/epan/dissectors/packet-vtp.c index 5d68cc809d..10f5a835b8 100644 --- a/epan/dissectors/packet-vtp.c +++ b/epan/dissectors/packet-vtp.c @@ -22,8 +22,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-wap.c b/epan/dissectors/packet-wap.c index 1d56f9ade7..175712abcc 100644 --- a/epan/dissectors/packet-wap.c +++ b/epan/dissectors/packet-wap.c @@ -27,7 +27,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-wap.h" diff --git a/epan/dissectors/packet-wassp.c b/epan/dissectors/packet-wassp.c index 1d19279ae1..59306c10b4 100644 --- a/epan/dissectors/packet-wassp.c +++ b/epan/dissectors/packet-wassp.c @@ -42,10 +42,8 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/exceptions.h> -#include <epan/wmem/wmem.h> #include <epan/expert.h> #include <epan/show_exception.h> diff --git a/epan/dissectors/packet-waveagent.c b/epan/dissectors/packet-waveagent.c index a90ec93064..0de2107537 100644 --- a/epan/dissectors/packet-waveagent.c +++ b/epan/dissectors/packet-waveagent.c @@ -23,11 +23,7 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <epan/wmem/wmem.h> - #define ETHERNET_INTERFACE 1 #define WLAN_INTERFACE 2 diff --git a/epan/dissectors/packet-wbxml.c b/epan/dissectors/packet-wbxml.c index 04df11daf5..8e9a19acd4 100644 --- a/epan/dissectors/packet-wbxml.c +++ b/epan/dissectors/packet-wbxml.c @@ -46,13 +46,9 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> - /* We need the function tvb_get_guintvar() */ #include "packet-wap.h" diff --git a/epan/dissectors/packet-wccp.c b/epan/dissectors/packet-wccp.c index 88ce88f1d0..2e41ae4723 100644 --- a/epan/dissectors/packet-wccp.c +++ b/epan/dissectors/packet-wccp.c @@ -23,10 +23,8 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/to_str.h> -#include <epan/wmem/wmem.h> #include <epan/ipproto.h> #include <epan/expert.h> #include <epan/ipv6-utils.h> diff --git a/epan/dissectors/packet-wcp.c b/epan/dissectors/packet-wcp.c index 02798aa577..779c1f5f08 100644 --- a/epan/dissectors/packet-wcp.c +++ b/epan/dissectors/packet-wcp.c @@ -97,14 +97,12 @@ #include "config.h" #include <stdio.h> -#include <glib.h> #include <string.h> #include <epan/packet.h> #include <wiretap/wtap.h> #include <wsutil/pint.h> #include <epan/circuit.h> -#include <epan/wmem/wmem.h> #include <epan/etypes.h> #include <epan/nlpid.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-websocket.c b/epan/dissectors/packet-websocket.c index b29a1c582d..a8bff9bf9c 100644 --- a/epan/dissectors/packet-websocket.c +++ b/epan/dissectors/packet-websocket.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-wfleet-hdlc.c b/epan/dissectors/packet-wfleet-hdlc.c index 6f1865d8a2..32aa3145b2 100644 --- a/epan/dissectors/packet-wfleet-hdlc.c +++ b/epan/dissectors/packet-wfleet-hdlc.c @@ -23,7 +23,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/etypes.h> #include <epan/addr_resolv.h> diff --git a/epan/dissectors/packet-who.c b/epan/dissectors/packet-who.c index 1c62313b38..be8dcdeebd 100644 --- a/epan/dissectors/packet-who.c +++ b/epan/dissectors/packet-who.c @@ -24,7 +24,6 @@ #include "config.h" #include <time.h> -#include <glib.h> #include <epan/packet.h> #include <epan/to_str.h> diff --git a/epan/dissectors/packet-whois.c b/epan/dissectors/packet-whois.c index a95a4d2e8e..d74a0f04b7 100644 --- a/epan/dissectors/packet-whois.c +++ b/epan/dissectors/packet-whois.c @@ -22,10 +22,8 @@ */ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> #include <epan/expert.h> #define WHOIS_PORT 43 /* This is the registered IANA port (nicname) */ diff --git a/epan/dissectors/packet-wifi-display.c b/epan/dissectors/packet-wifi-display.c index 502c3d56ff..6ea7eebb27 100644 --- a/epan/dissectors/packet-wifi-display.c +++ b/epan/dissectors/packet-wifi-display.c @@ -21,7 +21,6 @@ # include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/to_str.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-wifi-p2p.c b/epan/dissectors/packet-wifi-p2p.c index 7fd7e11573..7d9bbea8e5 100644 --- a/epan/dissectors/packet-wifi-p2p.c +++ b/epan/dissectors/packet-wifi-p2p.c @@ -21,7 +21,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/to_str.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-windows-common.c b/epan/dissectors/packet-windows-common.c index 4241f96f0e..a9be550717 100644 --- a/epan/dissectors/packet-windows-common.c +++ b/epan/dissectors/packet-windows-common.c @@ -22,17 +22,15 @@ #include "config.h" -#include <glib.h> #include <string.h> #include <epan/packet.h> #include <epan/expert.h> #include <epan/exceptions.h> -#include <epan/wmem/wmem.h> #include "packet-dcerpc.h" #include "packet-smb-sidsnooping.h" #include "packet-windows-common.h" -#include <epan/dissectors/packet-smb.h> /* for "sid_name_snooping" */ +#include "packet-smb.h" /* for "sid_name_snooping" */ static int hf_nt_sec_desc_revision = -1; static int hf_nt_sec_desc_type_owner_defaulted = -1; diff --git a/epan/dissectors/packet-winsrepl.c b/epan/dissectors/packet-winsrepl.c index 7737a521fe..c7a19a2601 100644 --- a/epan/dissectors/packet-winsrepl.c +++ b/epan/dissectors/packet-winsrepl.c @@ -27,8 +27,6 @@ #include "config.h" #include <time.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include <epan/exceptions.h> diff --git a/epan/dissectors/packet-wlccp.c b/epan/dissectors/packet-wlccp.c index 0e439f17c9..45395e41d9 100644 --- a/epan/dissectors/packet-wlccp.c +++ b/epan/dissectors/packet-wlccp.c @@ -59,8 +59,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/etypes.h> #include <epan/oui.h> diff --git a/epan/dissectors/packet-wol.c b/epan/dissectors/packet-wol.c index ca66821f0e..76ddcb00db 100644 --- a/epan/dissectors/packet-wol.c +++ b/epan/dissectors/packet-wol.c @@ -54,8 +54,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/addr_resolv.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-wow.c b/epan/dissectors/packet-wow.c index 056419a35c..9b31546721 100644 --- a/epan/dissectors/packet-wow.c +++ b/epan/dissectors/packet-wow.c @@ -28,8 +28,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include "packet-tcp.h" diff --git a/epan/dissectors/packet-wps.c b/epan/dissectors/packet-wps.c index ddbba5929c..2d99955975 100644 --- a/epan/dissectors/packet-wps.c +++ b/epan/dissectors/packet-wps.c @@ -34,7 +34,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include <epan/sminmpec.h> diff --git a/epan/dissectors/packet-wsmp.c b/epan/dissectors/packet-wsmp.c index 9ac2fe7e2e..53e1231459 100644 --- a/epan/dissectors/packet-wsmp.c +++ b/epan/dissectors/packet-wsmp.c @@ -25,8 +25,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c index 4635bf1fb2..1b3388bbbc 100644 --- a/epan/dissectors/packet-wsp.c +++ b/epan/dissectors/packet-wsp.c @@ -42,10 +42,8 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/to_str.h> -#include <epan/wmem/wmem.h> #include <epan/conversation.h> #include "packet-wap.h" diff --git a/epan/dissectors/packet-wtls.c b/epan/dissectors/packet-wtls.c index 4575603644..3907edbdc7 100644 --- a/epan/dissectors/packet-wtls.c +++ b/epan/dissectors/packet-wtls.c @@ -31,8 +31,6 @@ #include <stdio.h> #endif -#include <glib.h> - #include <epan/packet.h> #include "packet-wap.h" #include "packet-wtls.h" diff --git a/epan/dissectors/packet-wtp.c b/epan/dissectors/packet-wtp.c index 7f0b33f875..498371a27d 100644 --- a/epan/dissectors/packet-wtp.c +++ b/epan/dissectors/packet-wtp.c @@ -31,11 +31,8 @@ #include <stdio.h> #endif -#include <glib.h> - #include <epan/packet.h> #include <epan/reassemble.h> -#include <epan/wmem/wmem.h> #include "packet-wap.h" #include "packet-wtp.h" #include "packet-wsp.h" diff --git a/epan/dissectors/packet-x11.c b/epan/dissectors/packet-x11.c index fdf4ba6c68..b4950ea2cf 100644 --- a/epan/dissectors/packet-x11.c +++ b/epan/dissectors/packet-x11.c @@ -51,16 +51,12 @@ #include <assert.h> #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/conversation.h> #include <epan/expert.h> #include <epan/show_exception.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> - #include "packet-x11-keysymdef.h" #include "packet-x11.h" diff --git a/epan/dissectors/packet-x224.c b/epan/dissectors/packet-x224.c index a5b0c0c542..867eb6773a 100644 --- a/epan/dissectors/packet-x224.c +++ b/epan/dissectors/packet-x224.c @@ -24,13 +24,10 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-tpkt.h" #include <epan/conversation.h> -#include <epan/wmem/wmem.h> - void proto_register_x224(void); void proto_reg_handoff_x224(void); diff --git a/epan/dissectors/packet-x25.c b/epan/dissectors/packet-x25.c index 83ed92eace..7dee4160e5 100644 --- a/epan/dissectors/packet-x25.c +++ b/epan/dissectors/packet-x25.c @@ -25,15 +25,12 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/ax25_pids.h> #include <epan/llcsaps.h> #include <epan/circuit.h> #include <epan/reassemble.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> #include <epan/expert.h> #include <epan/nlpid.h> #include <epan/x264_prt_id.h> diff --git a/epan/dissectors/packet-x29.c b/epan/dissectors/packet-x29.c index 57363248a4..b6fde4e0a0 100644 --- a/epan/dissectors/packet-x29.c +++ b/epan/dissectors/packet-x29.c @@ -22,7 +22,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/nlpid.h> diff --git a/epan/dissectors/packet-xcsl.c b/epan/dissectors/packet-xcsl.c index 5a549de9b0..f9263a19f5 100644 --- a/epan/dissectors/packet-xcsl.c +++ b/epan/dissectors/packet-xcsl.c @@ -30,8 +30,6 @@ #include <stdlib.h> #include <string.h> -#include <glib.h> - #include <epan/packet.h> /* string array size */ diff --git a/epan/dissectors/packet-xdmcp.c b/epan/dissectors/packet-xdmcp.c index 383cefe8ef..59f433c76b 100644 --- a/epan/dissectors/packet-xdmcp.c +++ b/epan/dissectors/packet-xdmcp.c @@ -23,8 +23,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/to_str.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-xmcp.c b/epan/dissectors/packet-xmcp.c index d087cb56c2..0cbf4e50b8 100644 --- a/epan/dissectors/packet-xmcp.c +++ b/epan/dissectors/packet-xmcp.c @@ -30,16 +30,13 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/ipproto.h> #include <epan/addr_resolv.h> -#include <packet-tcp.h> #include <epan/prefs.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> #include <epan/expert.h> +#include "packet-tcp.h" void proto_register_xmcp(void); diff --git a/epan/dissectors/packet-xml.c b/epan/dissectors/packet-xml.c index 77d8f01bcf..b419d24ba7 100644 --- a/epan/dissectors/packet-xml.c +++ b/epan/dissectors/packet-xml.c @@ -34,18 +34,14 @@ #include <string.h> #include <errno.h> -#include <glib.h> - -#include <wsutil/str_util.h> -#include <wsutil/report_err.h> - -#include <epan/wmem/wmem.h> #include <epan/packet.h> #include <epan/tvbparse.h> #include <epan/dtd.h> #include <wsutil/filesystem.h> #include <epan/prefs.h> #include <epan/garrayfix.h> +#include <wsutil/str_util.h> +#include <wsutil/report_err.h> #include "packet-xml.h" diff --git a/epan/dissectors/packet-xmpp-conference.c b/epan/dissectors/packet-xmpp-conference.c index 6152f9bc4e..47b816bf88 100644 --- a/epan/dissectors/packet-xmpp-conference.c +++ b/epan/dissectors/packet-xmpp-conference.c @@ -26,15 +26,12 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <epan/dissectors/packet-xml.h> - -#include <packet-xmpp.h> -#include <packet-xmpp-utils.h> -#include <packet-xmpp-conference.h> +#include "packet-xml.h" +#include "packet-xmpp.h" +#include "packet-xmpp-utils.h" +#include "packet-xmpp-conference.h" static void xmpp_conf_desc(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element); diff --git a/epan/dissectors/packet-xmpp-core.c b/epan/dissectors/packet-xmpp-core.c index 41c0ac86b4..92dd573499 100644 --- a/epan/dissectors/packet-xmpp-core.c +++ b/epan/dissectors/packet-xmpp-core.c @@ -24,26 +24,20 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include <epan/conversation.h> #include <epan/expert.h> - -#include <epan/dissectors/packet-xml.h> - -#include <packet-xmpp-utils.h> -#include <packet-xmpp.h> -#include <packet-xmpp-core.h> -#include <packet-xmpp-jingle.h> -#include <packet-xmpp-other.h> -#include <packet-xmpp-gtalk.h> -#include <packet-xmpp-conference.h> - #include <epan/strutil.h> - -#include "epan/tvbparse.h" +#include <epan/tvbparse.h> + +#include "packet-xml.h" +#include "packet-xmpp-utils.h" +#include "packet-xmpp.h" +#include "packet-xmpp-core.h" +#include "packet-xmpp-jingle.h" +#include "packet-xmpp-other.h" +#include "packet-xmpp-gtalk.h" +#include "packet-xmpp-conference.h" tvbparse_wanted_t *want_ignore; tvbparse_wanted_t *want_stream_end_tag; diff --git a/epan/dissectors/packet-xmpp-gtalk.c b/epan/dissectors/packet-xmpp-gtalk.c index 4429847870..1eb9365965 100644 --- a/epan/dissectors/packet-xmpp-gtalk.c +++ b/epan/dissectors/packet-xmpp-gtalk.c @@ -26,16 +26,13 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <epan/dissectors/packet-xml.h> - -#include <packet-xmpp.h> -#include <packet-xmpp-utils.h> -#include <packet-xmpp-gtalk.h> -#include <packet-xmpp-conference.h> +#include "packet-xml.h" +#include "packet-xmpp.h" +#include "packet-xmpp-utils.h" +#include "packet-xmpp-gtalk.h" +#include "packet-xmpp-conference.h" static void xmpp_gtalk_session_desc(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element); diff --git a/epan/dissectors/packet-xmpp-jingle.c b/epan/dissectors/packet-xmpp-jingle.c index 423c4d39f8..6880b4f741 100644 --- a/epan/dissectors/packet-xmpp-jingle.c +++ b/epan/dissectors/packet-xmpp-jingle.c @@ -39,18 +39,15 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <epan/dissectors/packet-xml.h> - -#include <packet-xmpp.h> -#include <packet-xmpp-utils.h> -#include <packet-xmpp-jingle.h> -#include <packet-xmpp-conference.h> -#include <packet-xmpp-gtalk.h> -#include <packet-xmpp-other.h> +#include "packet-xml.h" +#include "packet-xmpp.h" +#include "packet-xmpp-utils.h" +#include "packet-xmpp-jingle.h" +#include "packet-xmpp-conference.h" +#include "packet-xmpp-gtalk.h" +#include "packet-xmpp-other.h" static void xmpp_jingle_content(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element); static void xmpp_jingle_content_description_rtp(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element); diff --git a/epan/dissectors/packet-xmpp-other.c b/epan/dissectors/packet-xmpp-other.c index c9ebea7385..389e99d619 100644 --- a/epan/dissectors/packet-xmpp-other.c +++ b/epan/dissectors/packet-xmpp-other.c @@ -26,16 +26,11 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> -#include <epan/wmem/wmem.h> - -#include <epan/dissectors/packet-xml.h> - -#include <packet-xmpp-utils.h> -#include <packet-xmpp.h> -#include <packet-xmpp-other.h> +#include "packet-xml.h" +#include "packet-xmpp-utils.h" +#include "packet-xmpp.h" +#include "packet-xmpp-other.h" static void xmpp_disco_items_item(proto_tree *tree, tvbuff_t *tvb, packet_info* pinfo, xmpp_element_t *element); diff --git a/epan/dissectors/packet-xmpp-utils.c b/epan/dissectors/packet-xmpp-utils.c index 59e36b7afa..7ca4850426 100644 --- a/epan/dissectors/packet-xmpp-utils.c +++ b/epan/dissectors/packet-xmpp-utils.c @@ -24,18 +24,15 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include <epan/tvbparse.h> #include <epan/strutil.h> -#include <epan/dissectors/packet-xml.h> - -#include <packet-xmpp.h> -#include <packet-xmpp-core.h> -#include <packet-xmpp-utils.h> +#include "packet-xml.h" +#include "packet-xmpp.h" +#include "packet-xmpp-core.h" +#include "packet-xmpp-utils.h" void diff --git a/epan/dissectors/packet-xmpp.c b/epan/dissectors/packet-xmpp.c index 2fa73ec49f..e323737907 100644 --- a/epan/dissectors/packet-xmpp.c +++ b/epan/dissectors/packet-xmpp.c @@ -26,19 +26,15 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include <epan/conversation.h> #include <epan/prefs.h> -#include <epan/dissectors/packet-xml.h> - -#include <packet-xmpp-utils.h> -#include <packet-xmpp.h> -#include <packet-xmpp-core.h> -#include <packet-xmpp-jingle.h> +#include "packet-xmpp-utils.h" +#include "packet-xmpp.h" +#include "packet-xmpp-core.h" +#include "packet-xmpp-jingle.h" +#include "packet-xml.h" #define XMPP_PORT 5222 diff --git a/epan/dissectors/packet-xot.c b/epan/dissectors/packet-xot.c index fb5b3da1ef..e3826ce7a7 100644 --- a/epan/dissectors/packet-xot.c +++ b/epan/dissectors/packet-xot.c @@ -24,8 +24,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include "packet-tcp.h" #include <epan/prefs.h> diff --git a/epan/dissectors/packet-xtp.c b/epan/dissectors/packet-xtp.c index 9605c4441d..de2a3c6fde 100644 --- a/epan/dissectors/packet-xtp.c +++ b/epan/dissectors/packet-xtp.c @@ -25,15 +25,11 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/expert.h> #include <epan/ipproto.h> #include <epan/in_cksum.h> -#include <epan/wmem/wmem.h> - #define XTP_VERSION_4 0x001 diff --git a/epan/dissectors/packet-xyplex.c b/epan/dissectors/packet-xyplex.c index 64a66944d0..9f404037a2 100644 --- a/epan/dissectors/packet-xyplex.c +++ b/epan/dissectors/packet-xyplex.c @@ -26,7 +26,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/conversation.h> diff --git a/epan/dissectors/packet-yami.c b/epan/dissectors/packet-yami.c index d4b172e82c..a3f5f0f733 100644 --- a/epan/dissectors/packet-yami.c +++ b/epan/dissectors/packet-yami.c @@ -32,7 +32,7 @@ #include <epan/prefs.h> #include <epan/strutil.h> #include <epan/to_str.h> -#include <epan/dissectors/packet-tcp.h> +#include "packet-tcp.h" void proto_reg_handoff_yami(void); void proto_register_yami(void); diff --git a/epan/dissectors/packet-yhoo.c b/epan/dissectors/packet-yhoo.c index 27b5dbd43f..2985934c5a 100644 --- a/epan/dissectors/packet-yhoo.c +++ b/epan/dissectors/packet-yhoo.c @@ -25,8 +25,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> void proto_register_yhoo(void); diff --git a/epan/dissectors/packet-ymsg.c b/epan/dissectors/packet-ymsg.c index ad96d89a58..74ded821e8 100644 --- a/epan/dissectors/packet-ymsg.c +++ b/epan/dissectors/packet-ymsg.c @@ -24,7 +24,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-tcp.h" diff --git a/epan/dissectors/packet-ypbind.c b/epan/dissectors/packet-ypbind.c index 0aa4ea4022..8bc5bbfbc6 100644 --- a/epan/dissectors/packet-ypbind.c +++ b/epan/dissectors/packet-ypbind.c @@ -26,8 +26,6 @@ #include "config.h" - - #include "packet-rpc.h" #include "packet-ypbind.h" diff --git a/epan/dissectors/packet-yppasswd.c b/epan/dissectors/packet-yppasswd.c index aef1ca0851..fd8291b8ae 100644 --- a/epan/dissectors/packet-yppasswd.c +++ b/epan/dissectors/packet-yppasswd.c @@ -22,8 +22,6 @@ #include "config.h" - - #include "packet-rpc.h" #include "packet-yppasswd.h" diff --git a/epan/dissectors/packet-ypserv.c b/epan/dissectors/packet-ypserv.c index 33f6615660..4c752f52a6 100644 --- a/epan/dissectors/packet-ypserv.c +++ b/epan/dissectors/packet-ypserv.c @@ -27,8 +27,6 @@ #include "config.h" - - #include "packet-rpc.h" #include "packet-ypserv.h" diff --git a/epan/dissectors/packet-ypxfr.c b/epan/dissectors/packet-ypxfr.c index 978e236a4d..066bf3c085 100644 --- a/epan/dissectors/packet-ypxfr.c +++ b/epan/dissectors/packet-ypxfr.c @@ -24,8 +24,6 @@ #include "config.h" - - #include "packet-rpc.h" #include "packet-ypxfr.h" diff --git a/epan/dissectors/packet-zbee-aps.c b/epan/dissectors/packet-zbee-aps.c index fe25445152..44647b4af2 100644 --- a/epan/dissectors/packet-zbee-aps.c +++ b/epan/dissectors/packet-zbee-aps.c @@ -26,13 +26,10 @@ #include "config.h" #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/prefs.h> /* req'd for packet-zbee-security.h */ #include <epan/expert.h> -#include <epan/wmem/wmem.h> #include <epan/reassemble.h> #include <epan/to_str.h> diff --git a/epan/dissectors/packet-zbee-nwk-gp.c b/epan/dissectors/packet-zbee-nwk-gp.c index 72d125c432..1a2b90abb9 100644 --- a/epan/dissectors/packet-zbee-nwk-gp.c +++ b/epan/dissectors/packet-zbee-nwk-gp.c @@ -27,7 +27,6 @@ /* Include files. */ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c index b859e42a4f..0cdb9c909c 100644 --- a/epan/dissectors/packet-zbee-nwk.c +++ b/epan/dissectors/packet-zbee-nwk.c @@ -27,15 +27,11 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/prefs.h> #include <epan/addr_resolv.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> - #include "packet-ieee802154.h" #include "packet-zbee.h" #include "packet-zbee-nwk.h" diff --git a/epan/dissectors/packet-zbee-security.c b/epan/dissectors/packet-zbee-security.c index 145a625274..253ae74688 100644 --- a/epan/dissectors/packet-zbee-security.c +++ b/epan/dissectors/packet-zbee-security.c @@ -32,7 +32,6 @@ #include <epan/prefs.h> #include <epan/expert.h> -#include <epan/emem.h> #include <epan/uat.h> /* We require libgcrpyt in order to decrypt ZigBee packets. Without it the best diff --git a/epan/dissectors/packet-zbee-zcl-general.c b/epan/dissectors/packet-zbee-zcl-general.c index b8b67f5e82..945a54bf38 100644 --- a/epan/dissectors/packet-zbee-zcl-general.c +++ b/epan/dissectors/packet-zbee-zcl-general.c @@ -27,7 +27,6 @@ #include "config.h" #include <string.h> -#include <glib.h> #include <epan/packet.h> #include <epan/to_str.h> diff --git a/epan/dissectors/packet-zbee-zcl-ha.c b/epan/dissectors/packet-zbee-zcl-ha.c index 28acbf9756..eda1e3383e 100644 --- a/epan/dissectors/packet-zbee-zcl-ha.c +++ b/epan/dissectors/packet-zbee-zcl-ha.c @@ -27,7 +27,6 @@ #include "config.h" #include <string.h> -#include <glib.h> #include <epan/packet.h> #include <epan/to_str.h> diff --git a/epan/dissectors/packet-zbee-zcl-meas-sensing.c b/epan/dissectors/packet-zbee-zcl-meas-sensing.c index 11eb20e520..8774d9ba22 100644 --- a/epan/dissectors/packet-zbee-zcl-meas-sensing.c +++ b/epan/dissectors/packet-zbee-zcl-meas-sensing.c @@ -27,7 +27,6 @@ #include "config.h" #include <string.h> -#include <glib.h> #include <epan/packet.h> #include "packet-zbee.h" diff --git a/epan/dissectors/packet-zbee-zcl-se.c b/epan/dissectors/packet-zbee-zcl-se.c index 12ad70ddef..379f832aa7 100644 --- a/epan/dissectors/packet-zbee-zcl-se.c +++ b/epan/dissectors/packet-zbee-zcl-se.c @@ -27,11 +27,10 @@ #include "config.h" #include <string.h> -#include <glib.h> +#include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> -#include <epan/packet.h> #include <epan/to_str.h> #include "packet-zbee.h" diff --git a/epan/dissectors/packet-zbee-zcl.c b/epan/dissectors/packet-zbee-zcl.c index 213d3e9477..1d585a95cf 100644 --- a/epan/dissectors/packet-zbee-zcl.c +++ b/epan/dissectors/packet-zbee-zcl.c @@ -28,7 +28,6 @@ /* Include Files */ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "packet-zbee.h" diff --git a/epan/dissectors/packet-zbee-zdp-binding.c b/epan/dissectors/packet-zbee-zdp-binding.c index d059f933c6..c40dc26f92 100644 --- a/epan/dissectors/packet-zbee-zdp-binding.c +++ b/epan/dissectors/packet-zbee-zdp-binding.c @@ -25,8 +25,6 @@ /* Include Files */ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/addr_resolv.h> diff --git a/epan/dissectors/packet-zbee-zdp-discovery.c b/epan/dissectors/packet-zbee-zdp-discovery.c index 95b6b6901a..0c7e5da3e3 100644 --- a/epan/dissectors/packet-zbee-zdp-discovery.c +++ b/epan/dissectors/packet-zbee-zdp-discovery.c @@ -25,11 +25,8 @@ /* Include Files */ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/addr_resolv.h> -#include <epan/wmem/wmem.h> - #include "packet-zbee.h" #include "packet-zbee-zdp.h" diff --git a/epan/dissectors/packet-zbee-zdp-management.c b/epan/dissectors/packet-zbee-zdp-management.c index 74a75b75a4..3bf1d00e8d 100644 --- a/epan/dissectors/packet-zbee-zdp-management.c +++ b/epan/dissectors/packet-zbee-zdp-management.c @@ -25,8 +25,6 @@ /* Include Files */ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/addr_resolv.h> diff --git a/epan/dissectors/packet-zbee-zdp.c b/epan/dissectors/packet-zbee-zdp.c index a86b46cfa5..4b9df53695 100644 --- a/epan/dissectors/packet-zbee-zdp.c +++ b/epan/dissectors/packet-zbee-zdp.c @@ -25,10 +25,7 @@ /* Include Files */ #include "config.h" -#include <glib.h> - #include <epan/packet.h> -#include <epan/wmem/wmem.h> #include <epan/expert.h> #include "packet-zbee.h" diff --git a/epan/dissectors/packet-zebra.c b/epan/dissectors/packet-zebra.c index 9af6819f85..9a5844b565 100644 --- a/epan/dissectors/packet-zebra.c +++ b/epan/dissectors/packet-zebra.c @@ -26,7 +26,6 @@ #include <string.h> -#include <glib.h> #include <epan/packet.h> /* Function declarations */ diff --git a/epan/dissectors/packet-zep.c b/epan/dissectors/packet-zep.c index d13685bde9..82ef9fb648 100644 --- a/epan/dissectors/packet-zep.c +++ b/epan/dissectors/packet-zep.c @@ -45,8 +45,6 @@ #include <string.h> -#include <glib.h> - #include <epan/packet.h> #include <epan/prefs.h> #include "packet-ntp.h" diff --git a/epan/dissectors/packet-ziop.c b/epan/dissectors/packet-ziop.c index abac667c69..4a85243cff 100644 --- a/epan/dissectors/packet-ziop.c +++ b/epan/dissectors/packet-ziop.c @@ -29,8 +29,6 @@ #include "config.h" -#include <glib.h> - #include <epan/packet.h> #include <epan/expert.h> #include <epan/conversation.h> diff --git a/epan/dissectors/packet-zrtp.c b/epan/dissectors/packet-zrtp.c index 51e052cc7f..40360c7f0f 100644 --- a/epan/dissectors/packet-zrtp.c +++ b/epan/dissectors/packet-zrtp.c @@ -27,10 +27,8 @@ #include "config.h" #include <string.h> -#include <glib.h> #include <epan/packet.h> #include <epan/strutil.h> -#include <epan/wmem/wmem.h> #include <epan/crc32-tvb.h> #include <wsutil/crc32.h> #include "packet-rtp.h" |