aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--epan/addr_resolv.c1
-rw-r--r--epan/address_to_str.c1
-rw-r--r--epan/asn1.c1
-rw-r--r--epan/circuit.c1
-rw-r--r--epan/column-utils.c1
-rw-r--r--epan/conversation.c1
-rw-r--r--epan/conversation_table.c1
-rw-r--r--epan/crypt/airpdcap.c1
-rw-r--r--epan/dfilter/dfunctions.c1
-rw-r--r--plugins/wimaxasncp/wimaxasncp_dict.l1
-rwxr-xr-xtools/ncp2222.py1
11 files changed, 0 insertions, 11 deletions
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c
index 623fafe40c..a27e09a760 100644
--- a/epan/addr_resolv.c
+++ b/epan/addr_resolv.c
@@ -133,7 +133,6 @@
#include <epan/strutil.h>
#include <epan/to_str-int.h>
#include <epan/prefs.h>
-#include <epan/emem.h>
#define ENAME_HOSTS "hosts"
#define ENAME_SUBNETS "subnets"
diff --git a/epan/address_to_str.c b/epan/address_to_str.c
index 1d388c9dfc..f4be5efd9b 100644
--- a/epan/address_to_str.c
+++ b/epan/address_to_str.c
@@ -59,7 +59,6 @@
#include "osi-utils.h"
#include <epan/dissectors/packet-mtp3.h>
#include <stdio.h>
-#include "emem.h"
#include "wmem/wmem.h"
static void
diff --git a/epan/asn1.c b/epan/asn1.c
index ea43f7001a..caefb08064 100644
--- a/epan/asn1.c
+++ b/epan/asn1.c
@@ -29,7 +29,6 @@
#include <stdlib.h>
#include <math.h>
-#include <epan/emem.h>
#include <epan/packet.h>
#include "asn1.h"
diff --git a/epan/circuit.c b/epan/circuit.c
index 80b73f791c..53b1c9d413 100644
--- a/epan/circuit.c
+++ b/epan/circuit.c
@@ -25,7 +25,6 @@
#include <glib.h>
#include "packet.h"
#include "circuit.h"
-#include "emem.h"
/*
* Hash table for circuits.
diff --git a/epan/column-utils.c b/epan/column-utils.c
index c06ad4c632..aafecbe2ae 100644
--- a/epan/column-utils.c
+++ b/epan/column-utils.c
@@ -39,7 +39,6 @@
#include "proto.h"
#include <epan/strutil.h>
-#include <epan/emem.h>
#include <epan/epan.h>
#include <epan/dfilter/dfilter.h>
diff --git a/epan/conversation.c b/epan/conversation.c
index fe932a4fb0..aa66996ef0 100644
--- a/epan/conversation.c
+++ b/epan/conversation.c
@@ -27,7 +27,6 @@
#include <string.h>
#include <glib.h>
#include "packet.h"
-#include "emem.h"
#include "to_str.h"
#include "conversation.h"
diff --git a/epan/conversation_table.c b/epan/conversation_table.c
index 478b966d3c..3f0d828036 100644
--- a/epan/conversation_table.c
+++ b/epan/conversation_table.c
@@ -29,7 +29,6 @@
#include "proto.h"
#include "conversation_table.h"
#include "addr_resolv.h"
-#include "emem.h"
#include "stat_tap_ui.h"
diff --git a/epan/crypt/airpdcap.c b/epan/crypt/airpdcap.c
index 2413a7cc48..d2bfee9102 100644
--- a/epan/crypt/airpdcap.c
+++ b/epan/crypt/airpdcap.c
@@ -48,7 +48,6 @@
#include <epan/tvbuff.h>
#include <epan/to_str.h>
#include <epan/strutil.h>
-#include <epan/emem.h>
#include <epan/crypt/airpdcap_rijndael.h>
#include "airpdcap_system.h"
diff --git a/epan/dfilter/dfunctions.c b/epan/dfilter/dfunctions.c
index 204e6f712b..e713540643 100644
--- a/epan/dfilter/dfunctions.c
+++ b/epan/dfilter/dfunctions.c
@@ -30,7 +30,6 @@
#include <ftypes/ftypes-int.h>
#include <ftypes/ftypes.h>
#include <epan/exceptions.h>
-#include <epan/emem.h>
/* Convert an FT_STRING using a callback function */
static gboolean
diff --git a/plugins/wimaxasncp/wimaxasncp_dict.l b/plugins/wimaxasncp/wimaxasncp_dict.l
index 58136abb5a..bf7a1027d4 100644
--- a/plugins/wimaxasncp/wimaxasncp_dict.l
+++ b/plugins/wimaxasncp/wimaxasncp_dict.l
@@ -65,7 +65,6 @@
#include <errno.h>
#include <stdlib.h>
#include <stdarg.h>
-#include <epan/emem.h>
#include <epan/value_string.h>
#include <epan/packet.h> /* array_length */
#include <wsutil/file_util.h>
diff --git a/tools/ncp2222.py b/tools/ncp2222.py
index b86b2cddf4..43e677dc97 100755
--- a/tools/ncp2222.py
+++ b/tools/ncp2222.py
@@ -5740,7 +5740,6 @@ def produce_code():
#include <epan/to_str.h>
#include <epan/conversation.h>
#include <epan/ptvcursor.h>
-#include <epan/emem.h>
#include <epan/strutil.h>
#include <epan/reassemble.h>
#include <epan/tap.h>