#include <emem.h> not req'd

svn path=/trunk/; revision=26091

68 files changed, 0 insertions, 68 deletions

diff --git a/epan/dissectors/packet-acn.c b/epan/dissectors/packet-acn.c
index a6461adbc5..117c16b555 100644
--- a/epan/dissectors/packet-acn.c
+++ b/epan/dissectors/packet-acn.c
@@ -47,7 +47,6 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include <epan/emem.h>
 #include <epan/packet.h>
 #include <epan/ipv6-utils.h>
 #include <string.h>
diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c
index 6b7be996a4..746a7b1952 100644
--- a/epan/dissectors/packet-aim.c
+++ b/epan/dissectors/packet-aim.c
@@ -40,7 +40,6 @@
 
 #include <epan/packet.h>
 #include <epan/strutil.h>
-#include <epan/emem.h>
 
 #include "packet-tcp.h"
 #include "packet-aim.h"
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
index 2167155b00..91cf571bb0 100644
--- a/epan/dissectors/packet-ber.c
+++ b/epan/dissectors/packet-ber.c
@@ -73,7 +73,6 @@
 #include <epan/to_str.h>
 #include <epan/prefs.h>
 #include <epan/reassemble.h>
-#include <epan/emem.h>
 #include <epan/oids.h>
 #include <epan/expert.h>
 #include <epan/asn1.h>
diff --git a/epan/dissectors/packet-bittorrent.c b/epan/dissectors/packet-bittorrent.c
index 95c574148c..e6e1f3b46d 100644
--- a/epan/dissectors/packet-bittorrent.c
+++ b/epan/dissectors/packet-bittorrent.c
@@ -37,7 +37,6 @@
 #include <epan/conversation.h>
 #include <epan/packet.h>
 #include <epan/strutil.h>
-#include <epan/emem.h>
 
 #include "packet-tcp.h"
 
diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c
index 60135e7555..8d3e0db255 100644
--- a/epan/dissectors/packet-bootp.c
+++ b/epan/dissectors/packet-bootp.c
@@ -82,7 +82,6 @@
 #include <epan/tap.h>
 #include <epan/strutil.h>
 #include <epan/arptypes.h>
-#include <epan/emem.h>
 #include <epan/sminmpec.h>
 
 static int bootp_dhcp_tap = -1;
diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c
index 548dc6b111..b92ddcb1bb 100644
--- a/epan/dissectors/packet-bssgp.c
+++ b/epan/dissectors/packet-bssgp.c
@@ -35,7 +35,6 @@
 #include <math.h>
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include <prefs.h>
 
 #include "packet-bssgp.h"
diff --git a/epan/dissectors/packet-cast.c b/epan/dissectors/packet-cast.c
index ca29a7c286..f0748a0c0f 100644
--- a/epan/dissectors/packet-cast.c
+++ b/epan/dissectors/packet-cast.c
@@ -32,7 +32,6 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include <epan/emem.h>
 
 #include "packet-tcp.h"
 
diff --git a/epan/dissectors/packet-cigi.c b/epan/dissectors/packet-cigi.c
index 96c9698da5..bcb3fc1fdb 100644
--- a/epan/dissectors/packet-cigi.c
+++ b/epan/dissectors/packet-cigi.c
@@ -40,7 +40,6 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include <epan/emem.h>
 
 /* Forward declaration */
 void proto_reg_handoff_cigi(void);
diff --git a/epan/dissectors/packet-cimd.h b/epan/dissectors/packet-cimd.h
index bf54e31f9c..034ceeb932 100644
--- a/epan/dissectors/packet-cimd.h
+++ b/epan/dissectors/packet-cimd.h
@@ -33,7 +33,6 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include <epan/prefs.h>
 #include "packet-tcp.h"
 
diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c
index 7b6fab87a3..61aa7462c5 100644
--- a/epan/dissectors/packet-cip.c
+++ b/epan/dissectors/packet-cip.c
@@ -43,7 +43,6 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include "packet-tcp.h"
 #include "packet-cip.h"
 
diff --git a/epan/dissectors/packet-clnp.c b/epan/dissectors/packet-clnp.c
index 3b63732397..93f6083edd 100644
--- a/epan/dissectors/packet-clnp.c
+++ b/epan/dissectors/packet-clnp.c
@@ -34,7 +34,6 @@
 #include <epan/prefs.h>
 #include <epan/packet.h>
 #include <epan/reassemble.h>
-#include <epan/emem.h>
 #include "packet-frame.h"
 #include "packet-osi.h"
 #include "packet-osi-options.h"
diff --git a/epan/dissectors/packet-dhcp-failover.c b/epan/dissectors/packet-dhcp-failover.c
index f2d7d8a8e5..e478eac129 100644
--- a/epan/dissectors/packet-dhcp-failover.c
+++ b/epan/dissectors/packet-dhcp-failover.c
@@ -48,7 +48,6 @@
 #include <epan/packet.h>
 #include <epan/strutil.h>
 #include <epan/prefs.h>
-#include <epan/emem.h>
 #include "packet-arp.h"
 #include "packet-tcp.h"
 
diff --git a/epan/dissectors/packet-dlsw.c b/epan/dissectors/packet-dlsw.c
index 5b11361436..09a3c26592 100644
--- a/epan/dissectors/packet-dlsw.c
+++ b/epan/dissectors/packet-dlsw.c
@@ -34,7 +34,6 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include "packet-tcp.h"
 
 static int proto_dlsw = -1;
diff --git a/epan/dissectors/packet-drda.c b/epan/dissectors/packet-drda.c
index c8b87dff1c..2e23b950c4 100644
--- a/epan/dissectors/packet-drda.c
+++ b/epan/dissectors/packet-drda.c
@@ -49,7 +49,6 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include <epan/conversation.h>
 #include <epan/prefs.h>
 #include "packet-tcp.h"
diff --git a/epan/dissectors/packet-dsi.c b/epan/dissectors/packet-dsi.c
index 73621458d4..8e39400a40 100644
--- a/epan/dissectors/packet-dsi.c
+++ b/epan/dissectors/packet-dsi.c
@@ -33,7 +33,6 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/emem.h>
 
 #include <epan/prefs.h>
 #include "packet-tcp.h"
diff --git a/epan/dissectors/packet-e212.c b/epan/dissectors/packet-e212.c
index d06f93753a..6b9886e88e 100644
--- a/epan/dissectors/packet-e212.c
+++ b/epan/dissectors/packet-e212.c
@@ -33,7 +33,6 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/emem.h>
 
 #include "packet-e212.h"
 
diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c
index 90efc43194..a4153d1831 100644
--- a/epan/dissectors/packet-enip.c
+++ b/epan/dissectors/packet-enip.c
@@ -38,7 +38,6 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include <prefs.h>
 #include "packet-tcp.h"
 #include "packet-cip.h"
diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c
index b9cf9d34a7..958ec07214 100644
--- a/epan/dissectors/packet-epl.c
+++ b/epan/dissectors/packet-epl.c
@@ -44,7 +44,6 @@
 #include <gmodule.h>
 #include <epan/packet.h>
 #include <epan/etypes.h>
-#include <epan/emem.h>
 #include <epan/prefs.h>
 
 #include "packet-epl.h"
diff --git a/epan/dissectors/packet-esis.c b/epan/dissectors/packet-esis.c
index 9b39e94c5a..c19d03d12b 100644
--- a/epan/dissectors/packet-esis.c
+++ b/epan/dissectors/packet-esis.c
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include <epan/nlpid.h>
 #include "packet-osi.h"
 #include "packet-osi-options.h"
diff --git a/epan/dissectors/packet-ff.c b/epan/dissectors/packet-ff.c
index d31dfab6fe..8527ec6e43 100644
--- a/epan/dissectors/packet-ff.c
+++ b/epan/dissectors/packet-ff.c
@@ -49,7 +49,6 @@
 #include <string.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
-#include <epan/emem.h>
 #include <epan/expert.h>
 #include "packet-ff.h"
 #include "packet-tcp.h"
diff --git a/epan/dissectors/packet-gnutella.c b/epan/dissectors/packet-gnutella.c
index 5dcd1c9127..5dc7976132 100644
--- a/epan/dissectors/packet-gnutella.c
+++ b/epan/dissectors/packet-gnutella.c
@@ -35,7 +35,6 @@
 
 
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include "packet-gnutella.h"
 #include "packet-tcp.h"
 
diff --git a/epan/dissectors/packet-gsm_a_rp.c b/epan/dissectors/packet-gsm_a_rp.c
index a4038c6838..965604265a 100644
--- a/epan/dissectors/packet-gsm_a_rp.c
+++ b/epan/dissectors/packet-gsm_a_rp.c
@@ -43,7 +43,6 @@
 
 #include <epan/packet.h>
 #include <epan/tap.h>
-#include <epan/emem.h>
 
 #include "packet-sccp.h"
 #include "packet-gsm_a_common.h"
diff --git a/epan/dissectors/packet-gsm_a_rr.c b/epan/dissectors/packet-gsm_a_rr.c
index 907262097f..2220082192 100644
--- a/epan/dissectors/packet-gsm_a_rr.c
+++ b/epan/dissectors/packet-gsm_a_rr.c
@@ -49,7 +49,6 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/tap.h>
-#include <epan/emem.h>
 #include <epan/asn1.h>
 
 #include "packet-bssap.h"
diff --git a/epan/dissectors/packet-gsm_sms_ud.c b/epan/dissectors/packet-gsm_sms_ud.c
index 6dcb172451..9a95f83354 100644
--- a/epan/dissectors/packet-gsm_sms_ud.c
+++ b/epan/dissectors/packet-gsm_sms_ud.c
@@ -70,7 +70,6 @@
 #include <epan/packet.h>
 
 #include <epan/prefs.h>
-#include <epan/emem.h>
 #include <epan/reassemble.h>
 
 static void dissect_gsm_sms_ud(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c
index 576f16b366..52ff21915c 100644
--- a/epan/dissectors/packet-icmpv6.c
+++ b/epan/dissectors/packet-icmpv6.c
@@ -48,7 +48,6 @@
 #include <epan/in_cksum.h>
 #include <epan/addr_resolv.h>
 #include <epan/ipproto.h>
-#include <epan/emem.h>
 #include <epan/asn1.h>
 #include <epan/strutil.h>
 
diff --git a/epan/dissectors/packet-ifcp.c b/epan/dissectors/packet-ifcp.c
index 71e2f48923..4d73f50de4 100644
--- a/epan/dissectors/packet-ifcp.c
+++ b/epan/dissectors/packet-ifcp.c
@@ -42,7 +42,6 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include <epan/emem.h>
 #include <epan/conversation.h>
 #include "packet-tcp.h"
 
diff --git a/epan/dissectors/packet-imf.c b/epan/dissectors/packet-imf.c
index 5aab540858..02b741431b 100644
--- a/epan/dissectors/packet-imf.c
+++ b/epan/dissectors/packet-imf.c
@@ -38,7 +38,6 @@
 #include <epan/conversation.h>
 #include <epan/addr_resolv.h>
 #include <epan/strutil.h>
-#include <epan/emem.h>
 
 #include "packet-imf.h"
 
diff --git a/epan/dissectors/packet-ipdc.c b/epan/dissectors/packet-ipdc.c
index 24d2354aa5..9a8a219351 100644
--- a/epan/dissectors/packet-ipdc.c
+++ b/epan/dissectors/packet-ipdc.c
@@ -38,7 +38,6 @@
 #include <math.h>
 
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include "packet-ipdc.h"
 #include "packet-tcp.h"
 #include <epan/ipproto.h>
diff --git a/epan/dissectors/packet-ipp.c b/epan/dissectors/packet-ipp.c
index 72182e1df7..9848b0b800 100644
--- a/epan/dissectors/packet-ipp.c
+++ b/epan/dissectors/packet-ipp.c
@@ -34,7 +34,6 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/strutil.h>
-#include <epan/emem.h>
 #include <epan/to_str.h>
 #include "packet-http.h"
 
diff --git a/epan/dissectors/packet-isis-clv.c b/epan/dissectors/packet-isis-clv.c
index 25248f7863..50b0915cd9 100644
--- a/epan/dissectors/packet-isis-clv.c
+++ b/epan/dissectors/packet-isis-clv.c
@@ -32,7 +32,6 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include "packet-osi.h"
 #include "packet-isis.h"
 #include "packet-isis-clv.h"
diff --git a/epan/dissectors/packet-isns.c b/epan/dissectors/packet-isns.c
index 7aab967105..30807b8155 100644
--- a/epan/dissectors/packet-isns.c
+++ b/epan/dissectors/packet-isns.c
@@ -48,7 +48,6 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include <epan/conversation.h>
 #include "packet-tcp.h"
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-kpasswd.c b/epan/dissectors/packet-kpasswd.c
index 573f13b2d3..4f6179c207 100644
--- a/epan/dissectors/packet-kpasswd.c
+++ b/epan/dissectors/packet-kpasswd.c
@@ -30,7 +30,6 @@
 #endif
 
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include <epan/asn1.h>
 #include "packet-tcp.h"
 #include "packet-kerberos.h"
diff --git a/epan/dissectors/packet-laplink.c b/epan/dissectors/packet-laplink.c
index 0612991324..da83f452b2 100644
--- a/epan/dissectors/packet-laplink.c
+++ b/epan/dissectors/packet-laplink.c
@@ -36,7 +36,6 @@
 #include <epan/packet.h>
 #include <epan/strutil.h>
 #include <epan/conversation.h>
-#include <epan/emem.h>
 
 #include "packet-tcp.h"
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-lsc.c b/epan/dissectors/packet-lsc.c
index 53ffaf1b92..3a77d7ab87 100644
--- a/epan/dissectors/packet-lsc.c
+++ b/epan/dissectors/packet-lsc.c
@@ -34,7 +34,6 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include <epan/prefs.h>
 
 #include <packet-tcp.h>
diff --git a/epan/dissectors/packet-mmse.c b/epan/dissectors/packet-mmse.c
index 7df1bdd8a3..65eebf3a76 100644
--- a/epan/dissectors/packet-mmse.c
+++ b/epan/dissectors/packet-mmse.c
@@ -48,7 +48,6 @@
 #include "packet-wap.h"
 #include "packet-wsp.h"
 /* #include "packet-mmse.h" */		/* We autoregister	*/
-#include <epan/emem.h>
 
 #define	MM_QUOTE		0x7F	/* Quoted string	*/
 
diff --git a/epan/dissectors/packet-mount.c b/epan/dissectors/packet-mount.c
index 069b08af74..9b2f461720 100644
--- a/epan/dissectors/packet-mount.c
+++ b/epan/dissectors/packet-mount.c
@@ -35,7 +35,6 @@
 #include "packet-mount.h"
 #include "packet-nfs.h"
 
-#include <epan/emem.h>
 
 
 static int proto_mount = -1;
diff --git a/epan/dissectors/packet-mq.c b/epan/dissectors/packet-mq.c
index 9c86285bfc..25205eebeb 100644
--- a/epan/dissectors/packet-mq.c
+++ b/epan/dissectors/packet-mq.c
@@ -70,7 +70,6 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include <epan/conversation.h>
 #include <epan/reassemble.h>
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-msdp.c b/epan/dissectors/packet-msdp.c
index 6c85ba4bde..75fa0a35d6 100644
--- a/epan/dissectors/packet-msdp.c
+++ b/epan/dissectors/packet-msdp.c
@@ -36,7 +36,6 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include <epan/emem.h>
 
 /* MSDP message types. The messages are TLV (Type-Length-Value) encoded */
 enum { MSDP_SA     = 1,
diff --git a/epan/dissectors/packet-netsync.c b/epan/dissectors/packet-netsync.c
index 4f99ca95b7..79420be680 100644
--- a/epan/dissectors/packet-netsync.c
+++ b/epan/dissectors/packet-netsync.c
@@ -39,7 +39,6 @@
 #include <epan/addr_resolv.h>
 #include <epan/prefs.h>
 #include <epan/strutil.h>
-#include <epan/emem.h>
 #include "packet-tcp.h"
 
 /*
diff --git a/epan/dissectors/packet-omapi.c b/epan/dissectors/packet-omapi.c
index dfef66c9cc..5f0c2b3231 100644
--- a/epan/dissectors/packet-omapi.c
+++ b/epan/dissectors/packet-omapi.c
@@ -50,7 +50,6 @@
 #endif
 
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include <epan/ptvcursor.h>
 
 static int proto_omapi = -1;
diff --git a/epan/dissectors/packet-pcep.c b/epan/dissectors/packet-pcep.c
index 8b7d9284d3..39f41930e0 100644
--- a/epan/dissectors/packet-pcep.c
+++ b/epan/dissectors/packet-pcep.c
@@ -38,7 +38,6 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include <epan/dissectors/packet-tcp.h>
 
 #include "packet-frame.h"
diff --git a/epan/dissectors/packet-pgsql.c b/epan/dissectors/packet-pgsql.c
index d291b0b20b..e5a280c45d 100644
--- a/epan/dissectors/packet-pgsql.c
+++ b/epan/dissectors/packet-pgsql.c
@@ -32,7 +32,6 @@
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <epan/prefs.h>
-#include <epan/emem.h>
 
 #include "packet-tcp.h"
 #include <epan/reassemble.h>
diff --git a/epan/dissectors/packet-pim.c b/epan/dissectors/packet-pim.c
index beed814834..4577aca573 100644
--- a/epan/dissectors/packet-pim.c
+++ b/epan/dissectors/packet-pim.c
@@ -32,7 +32,6 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include <epan/ipproto.h>
 #include <epan/afn.h>
 #include "packet-ipv6.h"
diff --git a/epan/dissectors/packet-pktgen.c b/epan/dissectors/packet-pktgen.c
index 3bb06ff98f..4b119aeed3 100644
--- a/epan/dissectors/packet-pktgen.c
+++ b/epan/dissectors/packet-pktgen.c
@@ -42,7 +42,6 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include <epan/emem.h>
 
 /* magic num used for heuristic */
 static const guint8 pktgen_magic[] = { 0xbe, 0x9b, 0xe9, 0x55 };
diff --git a/epan/dissectors/packet-pppoe.c b/epan/dissectors/packet-pppoe.c
index 534b9890e9..ba0cea6208 100644
--- a/epan/dissectors/packet-pppoe.c
+++ b/epan/dissectors/packet-pppoe.c
@@ -29,7 +29,6 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include <epan/strutil.h>
 #include <epan/etypes.h>
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-rfc2190.c b/epan/dissectors/packet-rfc2190.c
index 1cc3aaaf56..4f61bc7cb8 100644
--- a/epan/dissectors/packet-rfc2190.c
+++ b/epan/dissectors/packet-rfc2190.c
@@ -44,7 +44,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <epan/emem.h>
 #include <epan/rtp_pt.h>
 #include <epan/iax2_codec_type.h>
 
diff --git a/epan/dissectors/packet-rtmpt.c b/epan/dissectors/packet-rtmpt.c
index 7ebe64bc30..b962128a2d 100644
--- a/epan/dissectors/packet-rtmpt.c
+++ b/epan/dissectors/packet-rtmpt.c
@@ -48,7 +48,6 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include <epan/conversation.h>
 #include <epan/prefs.h>
 #include "packet-tcp.h"
diff --git a/epan/dissectors/packet-s5066.c b/epan/dissectors/packet-s5066.c
index 224b9a8e27..44ad918e21 100644
--- a/epan/dissectors/packet-s5066.c
+++ b/epan/dissectors/packet-s5066.c
@@ -31,7 +31,6 @@
 #include <gmodule.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include <epan/emem.h>
 #include <epan/dissectors/packet-tcp.h> /* For tcp_dissect_pdus() */
 
 /* Forward reference */
diff --git a/epan/dissectors/packet-scsi-mmc.c b/epan/dissectors/packet-scsi-mmc.c
index 32f91b51a9..2544512283 100644
--- a/epan/dissectors/packet-scsi-mmc.c
+++ b/epan/dissectors/packet-scsi-mmc.c
@@ -31,7 +31,6 @@
 #include <string.h>
 #include <epan/strutil.h>
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include <epan/conversation.h>
 #include <epan/tap.h>
 #include "packet-scsi.h"
diff --git a/epan/dissectors/packet-scsi-sbc.c b/epan/dissectors/packet-scsi-sbc.c
index 77ceb56396..f7c03b6bb5 100644
--- a/epan/dissectors/packet-scsi-sbc.c
+++ b/epan/dissectors/packet-scsi-sbc.c
@@ -44,7 +44,6 @@
 #include <string.h>
 #include <epan/strutil.h>
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include <epan/conversation.h>
 #include <epan/tap.h>
 #include "packet-scsi.h"
diff --git a/epan/dissectors/packet-scsi-smc.c b/epan/dissectors/packet-scsi-smc.c
index f371f05121..ebd828ffd8 100644
--- a/epan/dissectors/packet-scsi-smc.c
+++ b/epan/dissectors/packet-scsi-smc.c
@@ -35,7 +35,6 @@
 #include <string.h>
 #include <epan/strutil.h>
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include <epan/conversation.h>
 #include <epan/tap.h>
 #include "packet-scsi.h"
diff --git a/epan/dissectors/packet-scsi-ssc.c b/epan/dissectors/packet-scsi-ssc.c
index 0c14c31ad1..298672d0ea 100644
--- a/epan/dissectors/packet-scsi-ssc.c
+++ b/epan/dissectors/packet-scsi-ssc.c
@@ -39,7 +39,6 @@
 #include <string.h>
 #include <epan/strutil.h>
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include <epan/conversation.h>
 #include <epan/tap.h>
 #include "packet-scsi.h"
diff --git a/epan/dissectors/packet-sigcomp.c b/epan/dissectors/packet-sigcomp.c
index 2a120877d9..371ab73d33 100644
--- a/epan/dissectors/packet-sigcomp.c
+++ b/epan/dissectors/packet-sigcomp.c
@@ -43,7 +43,6 @@
 #include <epan/packet.h>
 #include "prefs.h"
 #include "strutil.h"
-#include <epan/emem.h>
 #include <epan/expert.h>
 #include <epan/sigcomp-udvm.h>
 #include <epan/sigcomp_state_hdlr.h>
diff --git a/epan/dissectors/packet-skinny.c b/epan/dissectors/packet-skinny.c
index 64f160740a..e67829681a 100644
--- a/epan/dissectors/packet-skinny.c
+++ b/epan/dissectors/packet-skinny.c
@@ -44,7 +44,6 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include <epan/emem.h>
 
 #include "packet-rtp.h"
 #include "packet-tcp.h"
diff --git a/epan/dissectors/packet-slsk.c b/epan/dissectors/packet-slsk.c
index 83f22a4d95..317ef0074f 100644
--- a/epan/dissectors/packet-slsk.c
+++ b/epan/dissectors/packet-slsk.c
@@ -42,7 +42,6 @@
 
 #include <epan/packet.h>
 #include <epan/tvbuff.h>
-#include <epan/emem.h>
 #include "packet-tcp.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 8e8c86d8fc..0927a739f4 100644
--- a/epan/dissectors/packet-smb-browse.c
+++ b/epan/dissectors/packet-smb-browse.c
@@ -36,7 +36,6 @@
 #include <glib.h>
 #include <ctype.h>
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include <epan/dissectors/packet-smb.h>
 
 #include "packet-smb-browse.h"
diff --git a/epan/dissectors/packet-smb-mailslot.c b/epan/dissectors/packet-smb-mailslot.c
index 860d80c8f5..a6d89ab56f 100644
--- a/epan/dissectors/packet-smb-mailslot.c
+++ b/epan/dissectors/packet-smb-mailslot.c
@@ -34,7 +34,6 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include <epan/dissectors/packet-smb.h>
 #include "packet-smb-mailslot.h"
 #include "packet-smb-browse.h"
diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c
index 56b3fa411b..78578b0a8e 100644
--- a/epan/dissectors/packet-smb-pipe.c
+++ b/epan/dissectors/packet-smb-pipe.c
@@ -42,7 +42,6 @@ XXX  Fixme : shouldnt show [malformed frame] for long packets
 #include <glib.h>
 #include <ctype.h>
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include <epan/dissectors/packet-smb.h>
 #include "packet-smb-pipe.h"
 #include "packet-smb-browse.h"
diff --git a/epan/dissectors/packet-smb.h b/epan/dissectors/packet-smb.h
index cdb28e2ed0..18b9e776a2 100644
--- a/epan/dissectors/packet-smb.h
+++ b/epan/dissectors/packet-smb.h
@@ -26,7 +26,6 @@
 #ifndef __PACKET_SMB_H__
 #define __PACKET_SMB_H__
 
-#include <epan/emem.h>
 
 WS_VAR_IMPORT gboolean sid_name_snooping;
 
diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c
index 38052a6dbe..9ed35ed06f 100644
--- a/epan/dissectors/packet-sna.c
+++ b/epan/dissectors/packet-sna.c
@@ -30,7 +30,6 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include <epan/llcsaps.h>
 #include <epan/ppptypes.h>
 #include <epan/sna-utils.h>
diff --git a/epan/dissectors/packet-starteam.c b/epan/dissectors/packet-starteam.c
index b710a5b4ab..21742467a9 100644
--- a/epan/dissectors/packet-starteam.c
+++ b/epan/dissectors/packet-starteam.c
@@ -37,7 +37,6 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include <epan/conversation.h>
 #include <epan/prefs.h>
 #include "packet-tcp.h"
diff --git a/epan/dissectors/packet-tali.c b/epan/dissectors/packet-tali.c
index 878d456065..b7fde297cb 100644
--- a/epan/dissectors/packet-tali.c
+++ b/epan/dissectors/packet-tali.c
@@ -40,7 +40,6 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include <epan/emem.h>
 #include "packet-tcp.h"
 
 #define TALI_SYNC_LENGTH    4
diff --git a/epan/dissectors/packet-tapa.c b/epan/dissectors/packet-tapa.c
index 06025f97c1..df5527caef 100644
--- a/epan/dissectors/packet-tapa.c
+++ b/epan/dissectors/packet-tapa.c
@@ -38,7 +38,6 @@ Specs:
 
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/emem.h>
 
 /* protocol handles */
 static int proto_tapa = -1;
diff --git a/epan/dissectors/packet-tnef.c b/epan/dissectors/packet-tnef.c
index d9968015e9..e559a67990 100644
--- a/epan/dissectors/packet-tnef.c
+++ b/epan/dissectors/packet-tnef.c
@@ -38,7 +38,6 @@
 #include <epan/conversation.h>
 #include <epan/addr_resolv.h>
 #include <epan/strutil.h>
-#include <epan/emem.h>
 
 #include "packet-dcerpc.h"
 #include "packet-dcerpc-nspi.h"
diff --git a/epan/dissectors/packet-tns.c b/epan/dissectors/packet-tns.c
index 78e4eb522f..65a18743e8 100644
--- a/epan/dissectors/packet-tns.c
+++ b/epan/dissectors/packet-tns.c
@@ -33,7 +33,6 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include "packet-tcp.h"
 #include "packet-tns.h"
 
diff --git a/epan/dissectors/packet-uma.c b/epan/dissectors/packet-uma.c
index e561cf5575..bf44b656d6 100644
--- a/epan/dissectors/packet-uma.c
+++ b/epan/dissectors/packet-uma.c
@@ -72,7 +72,6 @@
 #include "packet-rtp.h"
 #include "packet-rtcp.h"
 #include "packet-e212.h"
-#include <epan/emem.h>
 #include "packet-tcp.h"
 
 /* Length field is 2 bytes and comes first */
diff --git a/epan/dissectors/packet-winsrepl.c b/epan/dissectors/packet-winsrepl.c
index 648fe589b6..bb6cd24146 100644
--- a/epan/dissectors/packet-winsrepl.c
+++ b/epan/dissectors/packet-winsrepl.c
@@ -42,7 +42,6 @@
 #include <epan/prefs.h>
 #include <epan/reassemble.h>
 #include <epan/tap.h>
-#include <epan/emem.h>
 
 #include "packet-windows-common.h"
 #include "packet-netbios.h"
diff --git a/epan/dissectors/packet-xot.c b/epan/dissectors/packet-xot.c
index 8ade1367e9..7e8675c7fd 100644
--- a/epan/dissectors/packet-xot.c
+++ b/epan/dissectors/packet-xot.c
@@ -35,7 +35,6 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include "packet-tcp.h"
 #include <epan/prefs.h>