17 files changed, 0 insertions, 20 deletions

diff --git a/asn1/disp/packet-disp-template.c b/asn1/disp/packet-disp-template.c
index 73383f36c4..300bfba385 100644
--- a/asn1/disp/packet-disp-template.c
+++ b/asn1/disp/packet-disp-template.c
@@ -50,7 +50,6 @@
 #include "packet-dap.h"
 #include "packet-dsp.h"
 #include "packet-disp.h"
-#include "packet-acse.h"
 
 
 /* we don't have a separate dissector for X519 - 
diff --git a/editcap.c b/editcap.c
index f9e39ba532..9ed53e6909 100644
--- a/editcap.c
+++ b/editcap.c
@@ -33,7 +33,6 @@
 #include <sys/time.h>
 #endif
 
-#include <string.h>
 #include "wtap.h"
 
 #ifdef NEED_GETOPT_H
diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c
index b22984163f..45e09c1cfc 100644
--- a/epan/dissectors/packet-cops.c
+++ b/epan/dissectors/packet-cops.c
@@ -87,7 +87,6 @@
 
 #include <epan/dissectors/format-oid.h>
 #include <epan/prefs.h>
-#include <epan/emem.h>
 #include "packet-ber.h"
 
 /* XXX - The "plain" COPS port (3288) can be overridden in the prefs.
diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c
index 7a291953dd..930073e232 100644
--- a/epan/dissectors/packet-dcm.c
+++ b/epan/dissectors/packet-dcm.c
@@ -105,7 +105,6 @@
 #include <epan/emem.h>
 #include <epan/strutil.h>
 #include <epan/conversation.h>
-#include <epan/emem.h>
 
 #include "packet-tcp.h"
 
diff --git a/epan/dissectors/packet-disp.c b/epan/dissectors/packet-disp.c
index eb9444e604..54105141c1 100644
--- a/epan/dissectors/packet-disp.c
+++ b/epan/dissectors/packet-disp.c
@@ -58,7 +58,6 @@
 #include "packet-dap.h"
 #include "packet-dsp.h"
 #include "packet-disp.h"
-#include "packet-acse.h"
 
 
 /* we don't have a separate dissector for X519 - 
diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c
index ec08d0b36e..ff3d3cf80c 100644
--- a/epan/dissectors/packet-dns.c
+++ b/epan/dissectors/packet-dns.c
@@ -46,7 +46,6 @@
 #include "packet-tcp.h"
 #include <epan/prefs.h>
 #include <epan/strutil.h>
-#include <epan/emem.h>
 
 static int proto_dns = -1;
 static int hf_dns_length = -1;
diff --git a/epan/dissectors/packet-ipdc.c b/epan/dissectors/packet-ipdc.c
index 442adf6412..23f99cda5a 100644
--- a/epan/dissectors/packet-ipdc.c
+++ b/epan/dissectors/packet-ipdc.c
@@ -41,7 +41,6 @@
 #include <epan/emem.h>
 #include "packet-ipdc.h"
 #include "packet-tcp.h"
-#include <epan/packet.h>
 #include <epan/ipproto.h>
 #include <epan/prefs.h>
 
diff --git a/epan/dissectors/packet-nhrp.c b/epan/dissectors/packet-nhrp.c
index 6e63fea0aa..2d1ce2663a 100644
--- a/epan/dissectors/packet-nhrp.c
+++ b/epan/dissectors/packet-nhrp.c
@@ -39,9 +39,6 @@
 #include <epan/sminmpec.h>
 #include <epan/prefs.h>
 
-#include <epan/packet.h>
-#include <epan/prefs.h>
-#include <epan/ipproto.h>
 #include <epan/in_cksum.h>
 #include "packet-nhrp.h"
 
diff --git a/epan/dissectors/packet-pvfs2.c b/epan/dissectors/packet-pvfs2.c
index 2d8ddf6589..0bff1f258d 100644
--- a/epan/dissectors/packet-pvfs2.c
+++ b/epan/dissectors/packet-pvfs2.c
@@ -46,7 +46,6 @@
 #include <epan/prefs.h>
 #include <epan/emem.h>
 #include <epan/strutil.h>
-#include <epan/prefs.h>
 #include "packet-tcp.h"
 
 #define TCP_PORT_PVFS2 3334
diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c
index 4300b09187..2d8297dbbc 100644
--- a/epan/dissectors/packet-radius.c
+++ b/epan/dissectors/packet-radius.c
@@ -57,7 +57,6 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/report_err.h>
-#include <epan/prefs.h>
 #include <epan/crypt-md5.h>
 #include <epan/sminmpec.h>
 #include <epan/filesystem.h>
diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c
index 23962e0526..52ce74261d 100644
--- a/epan/dissectors/packet-sip.c
+++ b/epan/dissectors/packet-sip.c
@@ -60,7 +60,6 @@
 
 #include "packet-sip.h"
 #include <epan/tap.h>
-#include <epan/emem.h>
 #include <epan/expert.h>
 
 #include "packet-tcp.h"
diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c
index 12e5029821..32478983f4 100644
--- a/gtk/capture_dlg.c
+++ b/gtk/capture_dlg.c
@@ -39,7 +39,6 @@
 #include <epan/addr_resolv.h>
 #include "main.h"
 #include "gui_utils.h"
-#include "capture.h"
 #include "capture_dlg.h"
 #include "capture_errs.h"
 #include "filter_dlg.h"
diff --git a/gtk/expert_dlg.c b/gtk/expert_dlg.c
index 4c6a716003..70f33ecbac 100644
--- a/gtk/expert_dlg.c
+++ b/gtk/expert_dlg.c
@@ -59,7 +59,6 @@
 #include <epan/prefs.h>
 #include "colors.h"
 #include "proto_draw.h"
-#include <epan/emem.h>
 
 
 
diff --git a/gtk/funnel_stat.c b/gtk/funnel_stat.c
index 5bf65a6fca..e7c7f6cf3f 100644
--- a/gtk/funnel_stat.c
+++ b/gtk/funnel_stat.c
@@ -54,7 +54,6 @@
 #include "../stat_menu.h"
 #include "../tap_dfilter_dlg.h"
 #include "font_utils.h"
-#include "../stat_menu.h"
 #include "gui_stat_menu.h"
 #include <epan/prefs.h>
 #include "column_prefs.h"
diff --git a/gtk/t38_analysis.c b/gtk/t38_analysis.c
index 83ab77397f..6ac67553d7 100644
--- a/gtk/t38_analysis.c
+++ b/gtk/t38_analysis.c
@@ -47,7 +47,6 @@
 #include "main.h"
 #include "alert_box.h"
 #include "simple_dialog.h"
-#include "graph_analysis.h"
 #include "gui_stat_menu.h"
 
 void voip_calls_init_tap(const char *);	
diff --git a/gtk/voip_calls_dlg.c b/gtk/voip_calls_dlg.c
index 5e1480d3c5..03d4a2ceb9 100644
--- a/gtk/voip_calls_dlg.c
+++ b/gtk/voip_calls_dlg.c
@@ -64,8 +64,6 @@
 
 #include <epan/to_str.h>
 
-#include <string.h>
-#include <ctype.h>
 #include <epan/address.h>
 #include <epan/addr_resolv.h>
 
diff --git a/tools/lemon/lemon.c b/tools/lemon/lemon.c
index 6a2752d8cf..075e64bdab 100644
--- a/tools/lemon/lemon.c
+++ b/tools/lemon/lemon.c
@@ -32,7 +32,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <stdlib.h>
 
 /*
  * Wrapper around "isupper()", "islower()", etc. to cast the argument to