From b5d7b7ab6e6b0e595d3250d7fa6553d0da79c000 Mon Sep 17 00:00:00 2001
From: Bill Meier <wmeier@newsguy.com>
Date: Sat, 20 Dec 2014 16:23:59 -0500
Subject: 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>
---
 epan/dissectors/packet-cdp.c | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'epan/dissectors/packet-cdp.c')

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>
 
-- 
cgit v1.2.3