nikai@nikai.net:

Remaining fixes from:
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1225

svn path=/trunk/; revision=19895

9 files changed, 0 insertions, 11 deletions

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"