Remove some apparently-unnecessary includes of emem.h.

Change-Id: Ib7d1b587b439ff21ec6b7f1756ce6ccf25b66f80
Reviewed-on: https://code.wireshark.org/review/6635
Reviewed-by: Guy Harris <guy@alum.mit.edu>

24 files changed, 0 insertions, 34 deletions

diff --git a/epan/follow.c b/epan/follow.c
index 61f73b596f..8900d7101c 100644
--- a/epan/follow.c
+++ b/epan/follow.c
@@ -34,7 +34,6 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/to_str.h>
-#include <epan/emem.h>
 #include <epan/dissectors/packet-tcp.h>
 #include <epan/dissectors/packet-udp.h>
 #include "follow.h"
diff --git a/epan/frame_data.c b/epan/frame_data.c
index bfce771779..526e95f924 100644
--- a/epan/frame_data.c
+++ b/epan/frame_data.c
@@ -29,7 +29,6 @@
 #include <wiretap/wtap.h>
 #include <epan/frame_data.h>
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include <epan/wmem/wmem.h>
 #include <epan/timestamp.h>
 #include <epan/packet_info.h>
diff --git a/epan/ftypes/ftype-integer.c b/epan/ftypes/ftype-integer.c
index 6a9df1a964..0b0dd698f9 100644
--- a/epan/ftypes/ftype-integer.c
+++ b/epan/ftypes/ftype-integer.c
@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <errno.h>
 #include "ftypes-int.h"
-#include <epan/emem.h>
 #include <epan/addr_resolv.h>
 
 #include <wsutil/pint.h>
diff --git a/epan/ftypes/ftype-string.c b/epan/ftypes/ftype-string.c
index d7d0a0060e..607295e56d 100644
--- a/epan/ftypes/ftype-string.c
+++ b/epan/ftypes/ftype-string.c
@@ -22,7 +22,6 @@
 
 #include <stdio.h>
 #include <ftypes-int.h>
-#include <epan/emem.h>
 #include <string.h>
 
 #define CMP_MATCHES cmp_matches
diff --git a/epan/gcp.c b/epan/gcp.c
index 5937ce8c3a..90b4dc77c2 100644
--- a/epan/gcp.c
+++ b/epan/gcp.c
@@ -29,8 +29,6 @@
 
 #include "config.h"
 
-#include <epan/emem.h>
-
 #include "gcp.h"
 
 static wmem_tree_t* msgs = NULL;
diff --git a/epan/guid-utils.c b/epan/guid-utils.c
index 66020afd4d..e8f786222c 100644
--- a/epan/guid-utils.c
+++ b/epan/guid-utils.c
@@ -28,7 +28,6 @@
 #include <glib.h>
 #include <epan/epan.h>
 #include <wsutil/unicode-utils.h>
-#include <epan/emem.h>
 #include <epan/wmem/wmem.h>
 #include "guid-utils.h"
 
diff --git a/epan/h225-persistentdata.c b/epan/h225-persistentdata.c
index f08fabdb20..6d5634cd65 100644
--- a/epan/h225-persistentdata.c
+++ b/epan/h225-persistentdata.c
@@ -28,7 +28,6 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/emem.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/epan/oids_test.c b/epan/oids_test.c
index 3a0fa7d6e3..8825d3c118 100644
--- a/epan/oids_test.c
+++ b/epan/oids_test.c
@@ -27,7 +27,6 @@
 #include <string.h>
 #include <glib.h>
 
-#include "emem.h"
 #include "oids.h"
 #include "wmem/wmem.h"
 
@@ -496,10 +495,6 @@ main(int argc, char **argv)
     oids_cleanup();
     wmem_destroy_allocator(test_scope);
     wmem_cleanup();
-    /*
-     * This might have been a good place for a call to ep_free_all() but that is not part of the
-     * public interface for emem.h
-     */
     return result;
 }
 
diff --git a/epan/osi-utils.c b/epan/osi-utils.c
index 00cdba13df..5632efacfb 100644
--- a/epan/osi-utils.c
+++ b/epan/osi-utils.c
@@ -32,7 +32,6 @@
 
 #include "tvbuff.h"
 #include "osi-utils.h"
-#include "emem.h"
 
 /*
  * XXX - shouldn't there be a centralized routine for dissecting NSAPs?
diff --git a/epan/range.c b/epan/range.c
index 0101a8d86e..cc58292f73 100644
--- a/epan/range.c
+++ b/epan/range.c
@@ -34,7 +34,6 @@
 #include <epan/frame_data.h>
 
 #include <epan/range.h>
-#include <epan/emem.h>
 #include <stdio.h>
 
 /*
diff --git a/epan/reassemble.c b/epan/reassemble.c
index 109c040a3d..a10ff209cb 100644
--- a/epan/reassemble.c
+++ b/epan/reassemble.c
@@ -26,7 +26,6 @@
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
-#include <epan/emem.h>
 #include <epan/reassemble.h>
 #include <epan/tvbuff-int.h>
 
diff --git a/epan/reassemble_test.c b/epan/reassemble_test.c
index 8d9a9b5515..a4d8eb5beb 100644
--- a/epan/reassemble_test.c
+++ b/epan/reassemble_test.c
@@ -58,7 +58,6 @@
 
 #include "config.h"
 
-#include <epan/emem.h>
 #include <epan/packet.h>
 #include <epan/packet_info.h>
 #include <epan/proto.h>
diff --git a/epan/sigcomp-udvm.c b/epan/sigcomp-udvm.c
index c363b542e0..ed172c3424 100644
--- a/epan/sigcomp-udvm.c
+++ b/epan/sigcomp-udvm.c
@@ -35,8 +35,6 @@
 #include <string.h>
 #include <glib.h>
 
-#include <epan/emem.h>
-
 #include <wsutil/sha1.h>
 #include <wsutil/crc16.h>
 
diff --git a/epan/sna-utils.c b/epan/sna-utils.c
index 176c97a83e..7b5c19164f 100644
--- a/epan/sna-utils.c
+++ b/epan/sna-utils.c
@@ -28,7 +28,6 @@
 #include "packet_info.h"
 #include "wsutil/pint.h"
 #include "sna-utils.h"
-#include "emem.h"
 
 gchar *
 sna_fid_to_str(const address *addr)
diff --git a/epan/stream.c b/epan/stream.c
index eca4f917d1..03ab54a332 100644
--- a/epan/stream.c
+++ b/epan/stream.c
@@ -27,7 +27,6 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include <epan/reassemble.h>
 #include <epan/stream.h>
 #include <epan/tvbuff.h>
diff --git a/epan/strutil.c b/epan/strutil.c
index 53c646036d..762d704f2d 100644
--- a/epan/strutil.c
+++ b/epan/strutil.c
@@ -26,7 +26,6 @@
 #include <string.h>
 #include <glib.h>
 #include "strutil.h"
-#include "emem.h"
 
 #include <wsutil/str_util.h>
 #include <epan/proto.h>
diff --git a/epan/to_str.c b/epan/to_str.c
index e56381e4db..0a8f070ed3 100644
--- a/epan/to_str.c
+++ b/epan/to_str.c
@@ -27,7 +27,6 @@
 #include <time.h>
 #include <glib.h>
 
-#include "emem.h"
 #include "wmem/wmem.h"
 #include "proto.h"
 #include "to_str.h"
diff --git a/epan/tvbuff_composite.c b/epan/tvbuff_composite.c
index 60f8108bd6..684e6440e9 100644
--- a/epan/tvbuff_composite.c
+++ b/epan/tvbuff_composite.c
@@ -23,8 +23,6 @@
 
 #include "config.h"
 
-#include <epan/emem.h>
-
 #include "tvbuff.h"
 #include "tvbuff-int.h"
 #include "proto.h"	/* XXX - only used for DISSECTOR_ASSERT, probably a new header file? */
diff --git a/epan/tvbuff_real.c b/epan/tvbuff_real.c
index 991cc1c045..4d0b13d07a 100644
--- a/epan/tvbuff_real.c
+++ b/epan/tvbuff_real.c
@@ -23,8 +23,6 @@
 
 #include "config.h"
 
-#include <epan/emem.h>
-
 #include "tvbuff.h"
 #include "tvbuff-int.h"
 #include "proto.h"	/* XXX - only used for DISSECTOR_ASSERT, probably a new header file? */
diff --git a/epan/tvbuff_subset.c b/epan/tvbuff_subset.c
index 3b98a70b46..fbfe48af1c 100644
--- a/epan/tvbuff_subset.c
+++ b/epan/tvbuff_subset.c
@@ -23,8 +23,6 @@
 
 #include "config.h"
 
-#include <epan/emem.h>
-
 #include "tvbuff.h"
 #include "tvbuff-int.h"
 #include "proto.h"	/* XXX - only used for DISSECTOR_ASSERT, probably a new header file? */
diff --git a/epan/uat.c b/epan/uat.c
index ceafea8826..0b4099a6c7 100644
--- a/epan/uat.c
+++ b/epan/uat.c
@@ -38,7 +38,6 @@
 #include <wsutil/str_util.h>
 #include <wsutil/report_err.h>
 
-#include <epan/emem.h>
 #include <wsutil/filesystem.h>
 #include <epan/packet.h>
 #include <epan/range.h>
diff --git a/epan/uat.h b/epan/uat.h
index aac58358ed..8e9f56643f 100644
--- a/epan/uat.h
+++ b/epan/uat.h
@@ -30,8 +30,6 @@
 
 #include <stdlib.h>
 
-#include <epan/emem.h>
-
 #include "ws_symbol_export.h"
 
 #ifdef __cplusplus
diff --git a/epan/uat_load.l b/epan/uat_load.l
index acd9895f26..b9e8ee9a23 100644
--- a/epan/uat_load.l
+++ b/epan/uat_load.l
@@ -56,7 +56,6 @@
 
 #include <glib.h>
 
-#include <epan/emem.h>
 #include "uat-int.h"
 #include "uat_load_lex.h"
 #include <wsutil/file_util.h>
diff --git a/epan/xdlc.c b/epan/xdlc.c
index e4a0f0564c..d6c5453d14 100644
--- a/epan/xdlc.c
+++ b/epan/xdlc.c
@@ -29,7 +29,6 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/xdlc.h>
-#include <epan/emem.h>
 #include <wsutil/pint.h>
 
 const value_string ftype_vals[] = {