#include <string.h> not needed.

svn path=/trunk/; revision=32410

282 files changed, 0 insertions, 347 deletions

diff --git a/epan/dissectors/packet-acap.c b/epan/dissectors/packet-acap.c
index 2e7e089ff0..f4b659a3f3 100644
--- a/epan/dissectors/packet-acap.c
+++ b/epan/dissectors/packet-acap.c
@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/strutil.h>
diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c
index fa5606d4b3..ea32271b47 100644
--- a/epan/dissectors/packet-afp.c
+++ b/epan/dissectors/packet-afp.c
@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 /* #include <epan/strutil.h> */
diff --git a/epan/dissectors/packet-aim-admin.c b/epan/dissectors/packet-aim-admin.c
index 50ea335e27..239dd28648 100644
--- a/epan/dissectors/packet-aim-admin.c
+++ b/epan/dissectors/packet-aim-admin.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 
 #include <glib.h>
diff --git a/epan/dissectors/packet-aim-adverts.c b/epan/dissectors/packet-aim-adverts.c
index 12adc30c3f..d842544322 100644
--- a/epan/dissectors/packet-aim-adverts.c
+++ b/epan/dissectors/packet-aim-adverts.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 
 #include <glib.h>
diff --git a/epan/dissectors/packet-aim-bos.c b/epan/dissectors/packet-aim-bos.c
index 895bfacc1b..82c9ba6b0e 100644
--- a/epan/dissectors/packet-aim-bos.c
+++ b/epan/dissectors/packet-aim-bos.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 
 #include <glib.h>
diff --git a/epan/dissectors/packet-aim-buddylist.c b/epan/dissectors/packet-aim-buddylist.c
index d1a6940b82..eb5f0667c2 100644
--- a/epan/dissectors/packet-aim-buddylist.c
+++ b/epan/dissectors/packet-aim-buddylist.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 
 #include <glib.h>
diff --git a/epan/dissectors/packet-aim-chat.c b/epan/dissectors/packet-aim-chat.c
index fefb119084..a29e91d0ca 100644
--- a/epan/dissectors/packet-aim-chat.c
+++ b/epan/dissectors/packet-aim-chat.c
@@ -29,7 +29,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 
 #include <glib.h>
diff --git a/epan/dissectors/packet-aim-chatnav.c b/epan/dissectors/packet-aim-chatnav.c
index 97ce76f634..4ba4ede723 100644
--- a/epan/dissectors/packet-aim-chatnav.c
+++ b/epan/dissectors/packet-aim-chatnav.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 
 #include <glib.h>
diff --git a/epan/dissectors/packet-aim-directory.c b/epan/dissectors/packet-aim-directory.c
index b047de0fe1..ce453600d3 100644
--- a/epan/dissectors/packet-aim-directory.c
+++ b/epan/dissectors/packet-aim-directory.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 
 #include <glib.h>
diff --git a/epan/dissectors/packet-aim-email.c b/epan/dissectors/packet-aim-email.c
index 4c64e9c371..754fed5272 100644
--- a/epan/dissectors/packet-aim-email.c
+++ b/epan/dissectors/packet-aim-email.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 
 #include <glib.h>
diff --git a/epan/dissectors/packet-aim-generic.c b/epan/dissectors/packet-aim-generic.c
index 36dd505104..94fc20e776 100644
--- a/epan/dissectors/packet-aim-generic.c
+++ b/epan/dissectors/packet-aim-generic.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 
 #include <glib.h>
diff --git a/epan/dissectors/packet-aim-icq.c b/epan/dissectors/packet-aim-icq.c
index 7d6fb3d556..8b7e4c0170 100644
--- a/epan/dissectors/packet-aim-icq.c
+++ b/epan/dissectors/packet-aim-icq.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 
 #include <glib.h>
diff --git a/epan/dissectors/packet-aim-invitation.c b/epan/dissectors/packet-aim-invitation.c
index 090f89d0d1..0dedfa1667 100644
--- a/epan/dissectors/packet-aim-invitation.c
+++ b/epan/dissectors/packet-aim-invitation.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 
 #include <glib.h>
diff --git a/epan/dissectors/packet-aim-location.c b/epan/dissectors/packet-aim-location.c
index 98eb2cbe82..c22b298188 100644
--- a/epan/dissectors/packet-aim-location.c
+++ b/epan/dissectors/packet-aim-location.c
@@ -29,7 +29,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 
 #include <glib.h>
diff --git a/epan/dissectors/packet-aim-oft.c b/epan/dissectors/packet-aim-oft.c
index ce3f44a0b0..e17da74d2c 100644
--- a/epan/dissectors/packet-aim-oft.c
+++ b/epan/dissectors/packet-aim-oft.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 
 #include <glib.h>
diff --git a/epan/dissectors/packet-aim-popup.c b/epan/dissectors/packet-aim-popup.c
index dc33567d7a..286293ec30 100644
--- a/epan/dissectors/packet-aim-popup.c
+++ b/epan/dissectors/packet-aim-popup.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 
 #include <glib.h>
diff --git a/epan/dissectors/packet-aim-signon.c b/epan/dissectors/packet-aim-signon.c
index a909406e31..cde554bdf9 100644
--- a/epan/dissectors/packet-aim-signon.c
+++ b/epan/dissectors/packet-aim-signon.c
@@ -29,7 +29,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 
 #include <glib.h>
diff --git a/epan/dissectors/packet-aim-ssi.c b/epan/dissectors/packet-aim-ssi.c
index 454ff9fc5d..f81e1e65d2 100644
--- a/epan/dissectors/packet-aim-ssi.c
+++ b/epan/dissectors/packet-aim-ssi.c
@@ -29,7 +29,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 
 #include <glib.h>
diff --git a/epan/dissectors/packet-aim-sst.c b/epan/dissectors/packet-aim-sst.c
index 962cbcf12b..cfd8795863 100644
--- a/epan/dissectors/packet-aim-sst.c
+++ b/epan/dissectors/packet-aim-sst.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 
 #include <glib.h>
diff --git a/epan/dissectors/packet-aim-stats.c b/epan/dissectors/packet-aim-stats.c
index f06a3afdae..2f159ce66f 100644
--- a/epan/dissectors/packet-aim-stats.c
+++ b/epan/dissectors/packet-aim-stats.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 
 #include <glib.h>
diff --git a/epan/dissectors/packet-aim-translate.c b/epan/dissectors/packet-aim-translate.c
index 5ea003a777..c781a1ad5f 100644
--- a/epan/dissectors/packet-aim-translate.c
+++ b/epan/dissectors/packet-aim-translate.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 
 #include <glib.h>
diff --git a/epan/dissectors/packet-aim-userlookup.c b/epan/dissectors/packet-aim-userlookup.c
index c8d6ce4641..87d9ada8f9 100644
--- a/epan/dissectors/packet-aim-userlookup.c
+++ b/epan/dissectors/packet-aim-userlookup.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 
 #include <glib.h>
diff --git a/epan/dissectors/packet-airopeek.c b/epan/dissectors/packet-airopeek.c
index e852050fdd..7f79678538 100644
--- a/epan/dissectors/packet-airopeek.c
+++ b/epan/dissectors/packet-airopeek.c
@@ -39,7 +39,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 
diff --git a/epan/dissectors/packet-aodv.c b/epan/dissectors/packet-aodv.c
index 1197b977ba..38e956830e 100644
--- a/epan/dissectors/packet-aodv.c
+++ b/epan/dissectors/packet-aodv.c
@@ -30,7 +30,6 @@
 #ifdef HAVE_STDDEF_H
 #include <stddef.h>
 #endif
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-aoe.c b/epan/dissectors/packet-aoe.c
index 964b523ee5..7c6ba83224 100644
--- a/epan/dissectors/packet-aoe.c
+++ b/epan/dissectors/packet-aoe.c
@@ -23,7 +23,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-arcnet.c b/epan/dissectors/packet-arcnet.c
index 46e377d110..df572531a2 100644
--- a/epan/dissectors/packet-arcnet.c
+++ b/epan/dissectors/packet-arcnet.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-aruba-adp.c b/epan/dissectors/packet-aruba-adp.c
index eff14b8726..01383ae0d6 100644
--- a/epan/dissectors/packet-aruba-adp.c
+++ b/epan/dissectors/packet-aruba-adp.c
@@ -28,7 +28,6 @@
 # include "config.h"
 #endif
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-ascend.c b/epan/dissectors/packet-ascend.c
index 3d370edbc8..6f5a0e6cd1 100644
--- a/epan/dissectors/packet-ascend.c
+++ b/epan/dissectors/packet-ascend.c
@@ -26,7 +26,6 @@
 #endif
 
 #include <glib.h>
-#include <string.h>
 #include <epan/packet.h>
 
 static int proto_ascend  = -1;
diff --git a/epan/dissectors/packet-auto_rp.c b/epan/dissectors/packet-auto_rp.c
index d61bdb77bb..604a44ae01 100644
--- a/epan/dissectors/packet-auto_rp.c
+++ b/epan/dissectors/packet-auto_rp.c
@@ -29,7 +29,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
diff --git a/epan/dissectors/packet-ayiya.c b/epan/dissectors/packet-ayiya.c
index 47aab8c346..ec6eba99ab 100644
--- a/epan/dissectors/packet-ayiya.c
+++ b/epan/dissectors/packet-ayiya.c
@@ -29,7 +29,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/ipproto.h>
diff --git a/epan/dissectors/packet-bacnet.c b/epan/dissectors/packet-bacnet.c
index 9472d62043..a233b9f0e7 100644
--- a/epan/dissectors/packet-bacnet.c
+++ b/epan/dissectors/packet-bacnet.c
@@ -31,7 +31,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-banana.c b/epan/dissectors/packet-banana.c
index d1fff53488..ed5d2a54d1 100644
--- a/epan/dissectors/packet-banana.c
+++ b/epan/dissectors/packet-banana.c
@@ -33,7 +33,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-bfd.c b/epan/dissectors/packet-bfd.c
index 4f6e0c726b..96e8278511 100644
--- a/epan/dissectors/packet-bfd.c
+++ b/epan/dissectors/packet-bfd.c
@@ -33,7 +33,6 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/expert.h>
diff --git a/epan/dissectors/packet-bootparams.c b/epan/dissectors/packet-bootparams.c
index 78c4327b4b..0368c68b7a 100644
--- a/epan/dissectors/packet-bootparams.c
+++ b/epan/dissectors/packet-bootparams.c
@@ -28,7 +28,6 @@
 #include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 
 #include "packet-rpc.h"
diff --git a/epan/dissectors/packet-bpdu.c b/epan/dissectors/packet-bpdu.c
index 5a42fb606f..34fd4ee0da 100644
--- a/epan/dissectors/packet-bpdu.c
+++ b/epan/dissectors/packet-bpdu.c
@@ -28,7 +28,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/llcsaps.h>
diff --git a/epan/dissectors/packet-brdwlk.c b/epan/dissectors/packet-brdwlk.c
index eb8d90013d..994bc7db8a 100644
--- a/epan/dissectors/packet-brdwlk.c
+++ b/epan/dissectors/packet-brdwlk.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
diff --git a/epan/dissectors/packet-bssap.c b/epan/dissectors/packet-bssap.c
index 75a4988ab4..0e5971e185 100644
--- a/epan/dissectors/packet-bssap.c
+++ b/epan/dissectors/packet-bssap.c
@@ -46,8 +46,6 @@
 # include <netinet/in.h>
 #endif
 
-#include <string.h>
-
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/emem.h>
diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c
index 4d9e515170..bf4350f47d 100644
--- a/epan/dissectors/packet-bssgp.c
+++ b/epan/dissectors/packet-bssgp.c
@@ -30,7 +30,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 #include <math.h>
 #include <glib.h>
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c
index 566a3974de..fd7687cb75 100644
--- a/epan/dissectors/packet-capwap.c
+++ b/epan/dissectors/packet-capwap.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-cast.c b/epan/dissectors/packet-cast.c
index 1ab56702fa..299b6768d7 100644
--- a/epan/dissectors/packet-cast.c
+++ b/epan/dissectors/packet-cast.c
@@ -28,8 +28,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
-
 #include <epan/packet.h>
 #include <epan/prefs.h>
 
diff --git a/epan/dissectors/packet-ccsds.c b/epan/dissectors/packet-ccsds.c
index 4423dabfcd..976cecfbb3 100644
--- a/epan/dissectors/packet-ccsds.c
+++ b/epan/dissectors/packet-ccsds.c
@@ -29,7 +29,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-cfm.c b/epan/dissectors/packet-cfm.c
index afd74f1028..2085e31780 100644
--- a/epan/dissectors/packet-cfm.c
+++ b/epan/dissectors/packet-cfm.c
@@ -36,7 +36,6 @@
 
 #include <epan/packet.h>
 #include <glib.h>
-#include <string.h>
 #include <epan/etypes.h>
 #include "packet-cfm.h"
 
diff --git a/epan/dissectors/packet-cgmp.c b/epan/dissectors/packet-cgmp.c
index f902add981..85dfdc1880 100644
--- a/epan/dissectors/packet-cgmp.c
+++ b/epan/dissectors/packet-cgmp.c
@@ -25,7 +25,6 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-cisco-sm.c b/epan/dissectors/packet-cisco-sm.c
index d0807c8e73..50cc2d12f7 100644
--- a/epan/dissectors/packet-cisco-sm.c
+++ b/epan/dissectors/packet-cisco-sm.c
@@ -44,7 +44,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <epan/packet.h>
 
diff --git a/epan/dissectors/packet-cosine.c b/epan/dissectors/packet-cosine.c
index da3ee3ce66..84ed2c0dec 100644
--- a/epan/dissectors/packet-cosine.c
+++ b/epan/dissectors/packet-cosine.c
@@ -34,7 +34,6 @@
 #endif
 
 #include <glib.h>
-#include <string.h>
 #include <epan/packet.h>
 
 static int proto_cosine = -1;
diff --git a/epan/dissectors/packet-cpfi.c b/epan/dissectors/packet-cpfi.c
index 26045c333d..776c0c79dc 100644
--- a/epan/dissectors/packet-cpfi.c
+++ b/epan/dissectors/packet-cpfi.c
@@ -33,8 +33,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-ctdb.c b/epan/dissectors/packet-ctdb.c
index 69f026f9cf..a071e08317 100644
--- a/epan/dissectors/packet-ctdb.c
+++ b/epan/dissectors/packet-ctdb.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-cups.c b/epan/dissectors/packet-cups.c
index 01275181e1..a1c13133d5 100644
--- a/epan/dissectors/packet-cups.c
+++ b/epan/dissectors/packet-cups.c
@@ -27,7 +27,6 @@
 #include "config.h"
 #endif
 
-#include <string.h>
 #include <ctype.h>
 
 #include <glib.h>
diff --git a/epan/dissectors/packet-dcc.c b/epan/dissectors/packet-dcc.c
index 597397b5ef..8e23f86602 100644
--- a/epan/dissectors/packet-dcc.c
+++ b/epan/dissectors/packet-dcc.c
@@ -31,7 +31,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 
diff --git a/epan/dissectors/packet-dccp.c b/epan/dissectors/packet-dccp.c
index a8da9fdb33..e3560c71d4 100644
--- a/epan/dissectors/packet-dccp.c
+++ b/epan/dissectors/packet-dccp.c
@@ -52,7 +52,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-dcerpc-bossvr.c b/epan/dissectors/packet-dcerpc-bossvr.c
index 94a087c8e5..f0586358fc 100644
--- a/epan/dissectors/packet-dcerpc-bossvr.c
+++ b/epan/dissectors/packet-dcerpc-bossvr.c
@@ -35,8 +35,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-cds_clerkserver.c b/epan/dissectors/packet-dcerpc-cds_clerkserver.c
index 625336afe5..5c269c113a 100644
--- a/epan/dissectors/packet-dcerpc-cds_clerkserver.c
+++ b/epan/dissectors/packet-dcerpc-cds_clerkserver.c
@@ -36,8 +36,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-cds_solicit.c b/epan/dissectors/packet-dcerpc-cds_solicit.c
index df45dedc4e..62cec6fefa 100644
--- a/epan/dissectors/packet-dcerpc-cds_solicit.c
+++ b/epan/dissectors/packet-dcerpc-cds_solicit.c
@@ -34,8 +34,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-conv.c b/epan/dissectors/packet-dcerpc-conv.c
index f41eef0e47..0643383a46 100644
--- a/epan/dissectors/packet-dcerpc-conv.c
+++ b/epan/dissectors/packet-dcerpc-conv.c
@@ -32,8 +32,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-cprpc_server.c b/epan/dissectors/packet-dcerpc-cprpc_server.c
index 4bb40db1f8..adec146684 100644
--- a/epan/dissectors/packet-dcerpc-cprpc_server.c
+++ b/epan/dissectors/packet-dcerpc-cprpc_server.c
@@ -34,8 +34,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-dtsprovider.c b/epan/dissectors/packet-dcerpc-dtsprovider.c
index 51965c3800..9dab4a9bca 100644
--- a/epan/dissectors/packet-dcerpc-dtsprovider.c
+++ b/epan/dissectors/packet-dcerpc-dtsprovider.c
@@ -34,8 +34,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-dtsstime_req.c b/epan/dissectors/packet-dcerpc-dtsstime_req.c
index 0f593285c3..6fc822f6c1 100644
--- a/epan/dissectors/packet-dcerpc-dtsstime_req.c
+++ b/epan/dissectors/packet-dcerpc-dtsstime_req.c
@@ -34,8 +34,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-epm.c b/epan/dissectors/packet-dcerpc-epm.c
index 81669b77fc..fba2aebdb9 100644
--- a/epan/dissectors/packet-dcerpc-epm.c
+++ b/epan/dissectors/packet-dcerpc-epm.c
@@ -27,9 +27,6 @@
 #include "config.h"
 #endif
 
-
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/expert.h>
diff --git a/epan/dissectors/packet-dcerpc-fileexp.c b/epan/dissectors/packet-dcerpc-fileexp.c
index 40363e1621..6ba48cc661 100644
--- a/epan/dissectors/packet-dcerpc-fileexp.c
+++ b/epan/dissectors/packet-dcerpc-fileexp.c
@@ -35,8 +35,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-fldb.c b/epan/dissectors/packet-dcerpc-fldb.c
index fcdd8d87ce..764e798222 100644
--- a/epan/dissectors/packet-dcerpc-fldb.c
+++ b/epan/dissectors/packet-dcerpc-fldb.c
@@ -35,8 +35,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-ftserver.c b/epan/dissectors/packet-dcerpc-ftserver.c
index aedcad63e0..ea9bf8ef4a 100644
--- a/epan/dissectors/packet-dcerpc-ftserver.c
+++ b/epan/dissectors/packet-dcerpc-ftserver.c
@@ -35,8 +35,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-icl_rpc.c b/epan/dissectors/packet-dcerpc-icl_rpc.c
index 35af06f76d..e9c1861e07 100644
--- a/epan/dissectors/packet-dcerpc-icl_rpc.c
+++ b/epan/dissectors/packet-dcerpc-icl_rpc.c
@@ -34,8 +34,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-krb5rpc.c b/epan/dissectors/packet-dcerpc-krb5rpc.c
index 51892ebc5e..b19701a7a7 100644
--- a/epan/dissectors/packet-dcerpc-krb5rpc.c
+++ b/epan/dissectors/packet-dcerpc-krb5rpc.c
@@ -35,8 +35,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/asn1.h>
diff --git a/epan/dissectors/packet-dcerpc-llb.c b/epan/dissectors/packet-dcerpc-llb.c
index acfb818bfa..5c439cf0bd 100644
--- a/epan/dissectors/packet-dcerpc-llb.c
+++ b/epan/dissectors/packet-dcerpc-llb.c
@@ -35,8 +35,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-mgmt.c b/epan/dissectors/packet-dcerpc-mgmt.c
index ca12d46b4f..b5ed24e95f 100644
--- a/epan/dissectors/packet-dcerpc-mgmt.c
+++ b/epan/dissectors/packet-dcerpc-mgmt.c
@@ -27,9 +27,6 @@
 #include "config.h"
 #endif
 
-
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-ndr.c b/epan/dissectors/packet-dcerpc-ndr.c
index 6ef87bed4b..0d92d69a3e 100644
--- a/epan/dissectors/packet-dcerpc-ndr.c
+++ b/epan/dissectors/packet-dcerpc-ndr.c
@@ -27,7 +27,6 @@
 #include "config.h"
 #endif
 
-#include <string.h>
 #include <ctype.h>
 
 #include <glib.h>
diff --git a/epan/dissectors/packet-dcerpc-rdaclif.c b/epan/dissectors/packet-dcerpc-rdaclif.c
index e45f064bea..993f897fc8 100644
--- a/epan/dissectors/packet-dcerpc-rdaclif.c
+++ b/epan/dissectors/packet-dcerpc-rdaclif.c
@@ -35,8 +35,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-rep_proc.c b/epan/dissectors/packet-dcerpc-rep_proc.c
index 092c6c2748..5efa0b0e8a 100644
--- a/epan/dissectors/packet-dcerpc-rep_proc.c
+++ b/epan/dissectors/packet-dcerpc-rep_proc.c
@@ -35,8 +35,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-roverride.c b/epan/dissectors/packet-dcerpc-roverride.c
index a924450017..f3e95a109f 100644
--- a/epan/dissectors/packet-dcerpc-roverride.c
+++ b/epan/dissectors/packet-dcerpc-roverride.c
@@ -35,8 +35,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-rpriv.c b/epan/dissectors/packet-dcerpc-rpriv.c
index aff2a72e5b..ba580195f7 100644
--- a/epan/dissectors/packet-dcerpc-rpriv.c
+++ b/epan/dissectors/packet-dcerpc-rpriv.c
@@ -35,8 +35,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-rs_acct.c b/epan/dissectors/packet-dcerpc-rs_acct.c
index b42abd3d55..7083ad6fbd 100644
--- a/epan/dissectors/packet-dcerpc-rs_acct.c
+++ b/epan/dissectors/packet-dcerpc-rs_acct.c
@@ -35,8 +35,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-rs_attr.c b/epan/dissectors/packet-dcerpc-rs_attr.c
index 165cf79b2b..4a4dea0fcc 100644
--- a/epan/dissectors/packet-dcerpc-rs_attr.c
+++ b/epan/dissectors/packet-dcerpc-rs_attr.c
@@ -35,8 +35,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-rs_attr_schema.c b/epan/dissectors/packet-dcerpc-rs_attr_schema.c
index 9d8ddf379a..758dc6c302 100644
--- a/epan/dissectors/packet-dcerpc-rs_attr_schema.c
+++ b/epan/dissectors/packet-dcerpc-rs_attr_schema.c
@@ -35,8 +35,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-rs_bind.c b/epan/dissectors/packet-dcerpc-rs_bind.c
index bdd0a07b6e..b281e62d19 100644
--- a/epan/dissectors/packet-dcerpc-rs_bind.c
+++ b/epan/dissectors/packet-dcerpc-rs_bind.c
@@ -35,8 +35,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-rs_misc.c b/epan/dissectors/packet-dcerpc-rs_misc.c
index 3675612f62..6d2f446926 100644
--- a/epan/dissectors/packet-dcerpc-rs_misc.c
+++ b/epan/dissectors/packet-dcerpc-rs_misc.c
@@ -35,8 +35,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-rs_pgo.c b/epan/dissectors/packet-dcerpc-rs_pgo.c
index cd28cb5a2b..7cfc727b07 100644
--- a/epan/dissectors/packet-dcerpc-rs_pgo.c
+++ b/epan/dissectors/packet-dcerpc-rs_pgo.c
@@ -35,8 +35,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-rs_prop_acct.c b/epan/dissectors/packet-dcerpc-rs_prop_acct.c
index eab449e02d..a3788506a7 100644
--- a/epan/dissectors/packet-dcerpc-rs_prop_acct.c
+++ b/epan/dissectors/packet-dcerpc-rs_prop_acct.c
@@ -34,8 +34,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-rs_prop_acl.c b/epan/dissectors/packet-dcerpc-rs_prop_acl.c
index f03e97fd22..e0bee0e2b3 100644
--- a/epan/dissectors/packet-dcerpc-rs_prop_acl.c
+++ b/epan/dissectors/packet-dcerpc-rs_prop_acl.c
@@ -35,8 +35,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-rs_prop_attr.c b/epan/dissectors/packet-dcerpc-rs_prop_attr.c
index 01f730ef24..1e3482b225 100644
--- a/epan/dissectors/packet-dcerpc-rs_prop_attr.c
+++ b/epan/dissectors/packet-dcerpc-rs_prop_attr.c
@@ -35,8 +35,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-rs_prop_pgo.c b/epan/dissectors/packet-dcerpc-rs_prop_pgo.c
index 74c380259d..6fdcaaeba3 100644
--- a/epan/dissectors/packet-dcerpc-rs_prop_pgo.c
+++ b/epan/dissectors/packet-dcerpc-rs_prop_pgo.c
@@ -35,8 +35,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-rs_prop_plcy.c b/epan/dissectors/packet-dcerpc-rs_prop_plcy.c
index a36018e365..7118ddaa8d 100644
--- a/epan/dissectors/packet-dcerpc-rs_prop_plcy.c
+++ b/epan/dissectors/packet-dcerpc-rs_prop_plcy.c
@@ -35,8 +35,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c b/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c
index d1dfc2fc84..bc5731b579 100644
--- a/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c
+++ b/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c
@@ -35,8 +35,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-rs_repadm.c b/epan/dissectors/packet-dcerpc-rs_repadm.c
index 3f0457e081..d10501c744 100644
--- a/epan/dissectors/packet-dcerpc-rs_repadm.c
+++ b/epan/dissectors/packet-dcerpc-rs_repadm.c
@@ -35,8 +35,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-rs_replist.c b/epan/dissectors/packet-dcerpc-rs_replist.c
index fda6677310..d4ccd3258b 100644
--- a/epan/dissectors/packet-dcerpc-rs_replist.c
+++ b/epan/dissectors/packet-dcerpc-rs_replist.c
@@ -35,8 +35,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-rs_repmgr.c b/epan/dissectors/packet-dcerpc-rs_repmgr.c
index 95f58599e0..21b5681640 100644
--- a/epan/dissectors/packet-dcerpc-rs_repmgr.c
+++ b/epan/dissectors/packet-dcerpc-rs_repmgr.c
@@ -35,8 +35,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-rs_unix.c b/epan/dissectors/packet-dcerpc-rs_unix.c
index 449d0ba683..bf7f359de1 100644
--- a/epan/dissectors/packet-dcerpc-rs_unix.c
+++ b/epan/dissectors/packet-dcerpc-rs_unix.c
@@ -35,8 +35,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-rsec_login.c b/epan/dissectors/packet-dcerpc-rsec_login.c
index 6368e7c8f7..c012e2b088 100644
--- a/epan/dissectors/packet-dcerpc-rsec_login.c
+++ b/epan/dissectors/packet-dcerpc-rsec_login.c
@@ -35,8 +35,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-secidmap.c b/epan/dissectors/packet-dcerpc-secidmap.c
index d2fb1aa548..f3b7c641d0 100644
--- a/epan/dissectors/packet-dcerpc-secidmap.c
+++ b/epan/dissectors/packet-dcerpc-secidmap.c
@@ -35,8 +35,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-tkn4int.c b/epan/dissectors/packet-dcerpc-tkn4int.c
index 74eb3ebf6e..a80d6140ae 100644
--- a/epan/dissectors/packet-dcerpc-tkn4int.c
+++ b/epan/dissectors/packet-dcerpc-tkn4int.c
@@ -35,8 +35,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-ubikdisk.c b/epan/dissectors/packet-dcerpc-ubikdisk.c
index 4c0057aedd..f574b63d3f 100644
--- a/epan/dissectors/packet-dcerpc-ubikdisk.c
+++ b/epan/dissectors/packet-dcerpc-ubikdisk.c
@@ -35,8 +35,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-ubikvote.c b/epan/dissectors/packet-dcerpc-ubikvote.c
index 2e59b82dbe..1cc5e77e55 100644
--- a/epan/dissectors/packet-dcerpc-ubikvote.c
+++ b/epan/dissectors/packet-dcerpc-ubikvote.c
@@ -35,8 +35,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcerpc-update.c b/epan/dissectors/packet-dcerpc-update.c
index f8832e6261..ac3d76314d 100644
--- a/epan/dissectors/packet-dcerpc-update.c
+++ b/epan/dissectors/packet-dcerpc-update.c
@@ -35,8 +35,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcom-oxid.c b/epan/dissectors/packet-dcom-oxid.c
index a8c2119de4..6d1fc479a5 100644
--- a/epan/dissectors/packet-dcom-oxid.c
+++ b/epan/dissectors/packet-dcom-oxid.c
@@ -29,8 +29,6 @@
 #include "config.h"
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcom-remact.c b/epan/dissectors/packet-dcom-remact.c
index 46615e0a85..64bd69b56e 100644
--- a/epan/dissectors/packet-dcom-remact.c
+++ b/epan/dissectors/packet-dcom-remact.c
@@ -29,9 +29,6 @@
 #include "config.h"
 #endif
 
-
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dcom-remunkn.c b/epan/dissectors/packet-dcom-remunkn.c
index 34fdb78437..0b1f00111f 100644
--- a/epan/dissectors/packet-dcom-remunkn.c
+++ b/epan/dissectors/packet-dcom-remunkn.c
@@ -29,8 +29,6 @@
 #include "config.h"
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/emem.h>
diff --git a/epan/dissectors/packet-dcom-sysact.c b/epan/dissectors/packet-dcom-sysact.c
index b3605040b2..1c771d4b0c 100644
--- a/epan/dissectors/packet-dcom-sysact.c
+++ b/epan/dissectors/packet-dcom-sysact.c
@@ -27,8 +27,6 @@
 #include "config.h"
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-dec-bpdu.c b/epan/dissectors/packet-dec-bpdu.c
index de661cd02e..f2169354ae 100644
--- a/epan/dissectors/packet-dec-bpdu.c
+++ b/epan/dissectors/packet-dec-bpdu.c
@@ -28,7 +28,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
diff --git a/epan/dissectors/packet-dhcp-failover.c b/epan/dissectors/packet-dhcp-failover.c
index 83777e5aac..31ce0561dd 100644
--- a/epan/dissectors/packet-dhcp-failover.c
+++ b/epan/dissectors/packet-dhcp-failover.c
@@ -40,7 +40,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-diameter_3gpp.c b/epan/dissectors/packet-diameter_3gpp.c
index c989a4c5c4..ea5adafcfe 100644
--- a/epan/dissectors/packet-diameter_3gpp.c
+++ b/epan/dissectors/packet-diameter_3gpp.c
@@ -33,7 +33,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-dis-fields.c b/epan/dissectors/packet-dis-fields.c
index 92d7d40fec..f9d3444d9a 100644
--- a/epan/dissectors/packet-dis-fields.c
+++ b/epan/dissectors/packet-dis-fields.c
@@ -28,7 +28,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <epan/packet.h>
 #include "packet-dis-fields.h"
 #include "packet-dis-enums.h"
diff --git a/epan/dissectors/packet-dlm3.c b/epan/dissectors/packet-dlm3.c
index 33af87def4..abf4f25006 100644
--- a/epan/dissectors/packet-dlm3.c
+++ b/epan/dissectors/packet-dlm3.c
@@ -50,7 +50,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-dlsw.c b/epan/dissectors/packet-dlsw.c
index 727754a495..17eb5090ed 100644
--- a/epan/dissectors/packet-dlsw.c
+++ b/epan/dissectors/packet-dlsw.c
@@ -29,7 +29,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-tcp.h"
diff --git a/epan/dissectors/packet-dpnss-link.c b/epan/dissectors/packet-dpnss-link.c
index c3efe27daa..6ebc868396 100644
--- a/epan/dissectors/packet-dpnss-link.c
+++ b/epan/dissectors/packet-dpnss-link.c
@@ -32,7 +32,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-dpnss.c b/epan/dissectors/packet-dpnss.c
index 3d76f1fc86..d1f443ff8c 100644
--- a/epan/dissectors/packet-dpnss.c
+++ b/epan/dissectors/packet-dpnss.c
@@ -34,7 +34,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-drda.c b/epan/dissectors/packet-drda.c
index c9a2c60d98..30ffb9820b 100644
--- a/epan/dissectors/packet-drda.c
+++ b/epan/dissectors/packet-drda.c
@@ -45,8 +45,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
diff --git a/epan/dissectors/packet-dtp.c b/epan/dissectors/packet-dtp.c
index da83cf692d..38d6338469 100644
--- a/epan/dissectors/packet-dtp.c
+++ b/epan/dissectors/packet-dtp.c
@@ -31,7 +31,6 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-dvmrp.c b/epan/dissectors/packet-dvmrp.c
index 9c0764a7dc..93f2dd5078 100644
--- a/epan/dissectors/packet-dvmrp.c
+++ b/epan/dissectors/packet-dvmrp.c
@@ -55,7 +55,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-echo.c b/epan/dissectors/packet-echo.c
index b28ef89465..fcb5204b49 100644
--- a/epan/dissectors/packet-echo.c
+++ b/epan/dissectors/packet-echo.c
@@ -31,7 +31,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 
diff --git a/epan/dissectors/packet-ehs.c b/epan/dissectors/packet-ehs.c
index 62a2f43d1a..e511e439ad 100644
--- a/epan/dissectors/packet-ehs.c
+++ b/epan/dissectors/packet-ehs.c
@@ -29,7 +29,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-enttec.c b/epan/dissectors/packet-enttec.c
index 9d2367a477..d17f8acd98 100644
--- a/epan/dissectors/packet-enttec.c
+++ b/epan/dissectors/packet-enttec.c
@@ -33,7 +33,6 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <time.h>
-#include <string.h>
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-evrc.c b/epan/dissectors/packet-evrc.c
index 04d8ec9db7..babea7bca3 100644
--- a/epan/dissectors/packet-evrc.c
+++ b/epan/dissectors/packet-evrc.c
@@ -41,7 +41,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c
index 361a2e6ed9..7253262c51 100644
--- a/epan/dissectors/packet-fc.c
+++ b/epan/dissectors/packet-fc.c
@@ -31,7 +31,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
diff --git a/epan/dissectors/packet-fcels.c b/epan/dissectors/packet-fcels.c
index 87671e2f20..72a225c87f 100644
--- a/epan/dissectors/packet-fcels.c
+++ b/epan/dissectors/packet-fcels.c
@@ -33,7 +33,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
diff --git a/epan/dissectors/packet-fcip.c b/epan/dissectors/packet-fcip.c
index 6ac0409f39..4ad884f367 100644
--- a/epan/dissectors/packet-fcip.c
+++ b/epan/dissectors/packet-fcip.c
@@ -29,7 +29,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-fcp.c b/epan/dissectors/packet-fcp.c
index 749dcbcea5..307c984b1b 100644
--- a/epan/dissectors/packet-fcp.c
+++ b/epan/dissectors/packet-fcp.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
diff --git a/epan/dissectors/packet-fcsb3.c b/epan/dissectors/packet-fcsb3.c
index 1e3d116aa9..c0b7e377fe 100644
--- a/epan/dissectors/packet-fcsb3.c
+++ b/epan/dissectors/packet-fcsb3.c
@@ -35,7 +35,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
diff --git a/epan/dissectors/packet-fcsp.c b/epan/dissectors/packet-fcsp.c
index 8875f1e6f2..d512efc8fd 100644
--- a/epan/dissectors/packet-fcsp.c
+++ b/epan/dissectors/packet-fcsp.c
@@ -35,7 +35,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
diff --git a/epan/dissectors/packet-fefd.c b/epan/dissectors/packet-fefd.c
index dc3e8f49e8..b2cb62cd1b 100644
--- a/epan/dissectors/packet-fefd.c
+++ b/epan/dissectors/packet-fefd.c
@@ -29,7 +29,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-ff.c b/epan/dissectors/packet-ff.c
index 8e5e654fee..940944d62d 100644
--- a/epan/dissectors/packet-ff.c
+++ b/epan/dissectors/packet-ff.c
@@ -46,7 +46,6 @@
 #endif
 
 #include <glib.h>
-#include <string.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <epan/expert.h>
diff --git a/epan/dissectors/packet-fip.c b/epan/dissectors/packet-fip.c
index 84483bc66f..563e5ba256 100644
--- a/epan/dissectors/packet-fip.c
+++ b/epan/dissectors/packet-fip.c
@@ -39,7 +39,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-fmp_notify.c b/epan/dissectors/packet-fmp_notify.c
index 6be6c88ccb..f35f373de2 100644
--- a/epan/dissectors/packet-fmp_notify.c
+++ b/epan/dissectors/packet-fmp_notify.c
@@ -31,7 +31,6 @@
 #include <sys/types.h>
 #endif
 
-#include <string.h>
 #include <glib.h>
 #include <gmodule.h>
 
diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c
index 3520bc6aea..72476e9111 100644
--- a/epan/dissectors/packet-fr.c
+++ b/epan/dissectors/packet-fr.c
@@ -41,7 +41,6 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-g723.c b/epan/dissectors/packet-g723.c
index 7a97a5c7be..73ab7de249 100644
--- a/epan/dissectors/packet-g723.c
+++ b/epan/dissectors/packet-g723.c
@@ -30,7 +30,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-gdsdb.c b/epan/dissectors/packet-gdsdb.c
index 198f7a58b6..dd66b95296 100644
--- a/epan/dissectors/packet-gdsdb.c
+++ b/epan/dissectors/packet-gdsdb.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-gift.c b/epan/dissectors/packet-gift.c
index f5fe3eb994..4fc1f06839 100644
--- a/epan/dissectors/packet-gift.c
+++ b/epan/dissectors/packet-gift.c
@@ -30,7 +30,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/strutil.h>
diff --git a/epan/dissectors/packet-git.c b/epan/dissectors/packet-git.c
index b6a1ea5d93..37c60de6ee 100644
--- a/epan/dissectors/packet-git.c
+++ b/epan/dissectors/packet-git.c
@@ -33,7 +33,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/strutil.h>
diff --git a/epan/dissectors/packet-glbp.c b/epan/dissectors/packet-glbp.c
index a7a0a27c28..b635ab8767 100644
--- a/epan/dissectors/packet-glbp.c
+++ b/epan/dissectors/packet-glbp.c
@@ -42,7 +42,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/expert.h>
diff --git a/epan/dissectors/packet-gmrp.c b/epan/dissectors/packet-gmrp.c
index fc7570c39c..f1f011f70c 100644
--- a/epan/dissectors/packet-gmrp.c
+++ b/epan/dissectors/packet-gmrp.c
@@ -31,7 +31,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-gnutella.c b/epan/dissectors/packet-gnutella.c
index 10a2bff60c..f3c8d7bd87 100644
--- a/epan/dissectors/packet-gnutella.c
+++ b/epan/dissectors/packet-gnutella.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-gprs-llc.c b/epan/dissectors/packet-gprs-llc.c
index d28f117c31..0b70fa3d58 100644
--- a/epan/dissectors/packet-gprs-llc.c
+++ b/epan/dissectors/packet-gprs-llc.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-gprs-ns.c b/epan/dissectors/packet-gprs-ns.c
index f068a8ae3f..be86130046 100644
--- a/epan/dissectors/packet-gprs-ns.c
+++ b/epan/dissectors/packet-gprs-ns.c
@@ -28,7 +28,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 
diff --git a/epan/dissectors/packet-gsm_a_rp.c b/epan/dissectors/packet-gsm_a_rp.c
index 9763371b70..7e7ad220cd 100644
--- a/epan/dissectors/packet-gsm_a_rp.c
+++ b/epan/dissectors/packet-gsm_a_rp.c
@@ -38,8 +38,6 @@
 
 #include <stdlib.h>
 
-#include <string.h>
-
 #include <epan/packet.h>
 #include <epan/tap.h>
 
diff --git a/epan/dissectors/packet-gsm_bsslap.c b/epan/dissectors/packet-gsm_bsslap.c
index 160580673f..6ff1d79f7b 100644
--- a/epan/dissectors/packet-gsm_bsslap.c
+++ b/epan/dissectors/packet-gsm_bsslap.c
@@ -30,7 +30,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-gsm_sms_ud.c b/epan/dissectors/packet-gsm_sms_ud.c
index c1cc217458..fa909cfe13 100644
--- a/epan/dissectors/packet-gsm_sms_ud.c
+++ b/epan/dissectors/packet-gsm_sms_ud.c
@@ -61,7 +61,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 #include <time.h>
 
 #include <glib.h>
diff --git a/epan/dissectors/packet-gvrp.c b/epan/dissectors/packet-gvrp.c
index 97304a19fd..6b7f8a630a 100644
--- a/epan/dissectors/packet-gvrp.c
+++ b/epan/dissectors/packet-gvrp.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-h1.c b/epan/dissectors/packet-h1.c
index f1e75c77e2..6a492c540c 100644
--- a/epan/dissectors/packet-h1.c
+++ b/epan/dissectors/packet-h1.c
@@ -27,8 +27,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 
diff --git a/epan/dissectors/packet-h221_nonstd.c b/epan/dissectors/packet-h221_nonstd.c
index 8e90ede53a..ae4e7ef062 100644
--- a/epan/dissectors/packet-h221_nonstd.c
+++ b/epan/dissectors/packet-h221_nonstd.c
@@ -30,7 +30,6 @@
 #include <gmodule.h>
 #include <ctype.h>
 #include <time.h>
-#include <string.h>
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 #include <epan/strutil.h>
diff --git a/epan/dissectors/packet-h261.c b/epan/dissectors/packet-h261.c
index 91c037c4f6..a3f59f1710 100644
--- a/epan/dissectors/packet-h261.c
+++ b/epan/dissectors/packet-h261.c
@@ -39,8 +39,6 @@
 #include <glib.h>
 #include <epan/packet.h>
 
-#include <string.h>
-
 #include <epan/rtp_pt.h>
 #include <epan/iax2_codec_type.h>
 
diff --git a/epan/dissectors/packet-h263.c b/epan/dissectors/packet-h263.c
index cb0a6a0ec3..c780fb8fa3 100644
--- a/epan/dissectors/packet-h263.c
+++ b/epan/dissectors/packet-h263.c
@@ -39,8 +39,6 @@
 #include <glib.h>
 #include <epan/packet.h>
 
-#include <string.h>
-
 #include "packet-h263.h"
 
 static int proto_h263_data		= -1;
diff --git a/epan/dissectors/packet-h263p.c b/epan/dissectors/packet-h263p.c
index 2362382e84..7331f57d1a 100644
--- a/epan/dissectors/packet-h263p.c
+++ b/epan/dissectors/packet-h263p.c
@@ -36,8 +36,6 @@
 #include <glib.h>
 #include <epan/packet.h>
 
-#include <string.h>
-
 #include <epan/prefs.h>
 
 #include "packet-h263.h"
diff --git a/epan/dissectors/packet-hyperscsi.c b/epan/dissectors/packet-hyperscsi.c
index 14549c67f4..76d5815871 100644
--- a/epan/dissectors/packet-hyperscsi.c
+++ b/epan/dissectors/packet-hyperscsi.c
@@ -27,7 +27,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-icmp.c b/epan/dissectors/packet-icmp.c
index b63bb8812b..ac32b3691c 100644
--- a/epan/dissectors/packet-icmp.c
+++ b/epan/dissectors/packet-icmp.c
@@ -32,7 +32,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-icp.c b/epan/dissectors/packet-icp.c
index ceb4701afd..df75b2d554 100644
--- a/epan/dissectors/packet-icp.c
+++ b/epan/dissectors/packet-icp.c
@@ -31,7 +31,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
diff --git a/epan/dissectors/packet-ifcp.c b/epan/dissectors/packet-ifcp.c
index 1e801b8f77..5430c41228 100644
--- a/epan/dissectors/packet-ifcp.c
+++ b/epan/dissectors/packet-ifcp.c
@@ -35,7 +35,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-igrp.c b/epan/dissectors/packet-igrp.c
index 86e0a2ee0b..bd14ba3006 100644
--- a/epan/dissectors/packet-igrp.c
+++ b/epan/dissectors/packet-igrp.c
@@ -36,7 +36,6 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/ipproto.h>
diff --git a/epan/dissectors/packet-imap.c b/epan/dissectors/packet-imap.c
index 4b352d85fe..b8a33bca14 100644
--- a/epan/dissectors/packet-imap.c
+++ b/epan/dissectors/packet-imap.c
@@ -29,7 +29,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/strutil.h>
diff --git a/epan/dissectors/packet-imf.c b/epan/dissectors/packet-imf.c
index bfc03797c1..3747e18ce0 100644
--- a/epan/dissectors/packet-imf.c
+++ b/epan/dissectors/packet-imf.c
@@ -32,7 +32,6 @@
 #include <ctype.h>
 #include <time.h>
 #include <glib.h>
-#include <string.h>
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 #include <epan/strutil.h>
diff --git a/epan/dissectors/packet-ipfc.c b/epan/dissectors/packet-ipfc.c
index c27b126998..a8a82aab9c 100644
--- a/epan/dissectors/packet-ipfc.c
+++ b/epan/dissectors/packet-ipfc.c
@@ -31,7 +31,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-ipsi-ctl.c b/epan/dissectors/packet-ipsi-ctl.c
index 9a499bce2a..36606e141e 100644
--- a/epan/dissectors/packet-ipsi-ctl.c
+++ b/epan/dissectors/packet-ipsi-ctl.c
@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 
diff --git a/epan/dissectors/packet-ipvs-syncd.c b/epan/dissectors/packet-ipvs-syncd.c
index 75a09d4690..4ddc770338 100644
--- a/epan/dissectors/packet-ipvs-syncd.c
+++ b/epan/dissectors/packet-ipvs-syncd.c
@@ -26,7 +26,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-ipxwan.c b/epan/dissectors/packet-ipxwan.c
index 8e3d9e6b60..001b0d504a 100644
--- a/epan/dissectors/packet-ipxwan.c
+++ b/epan/dissectors/packet-ipxwan.c
@@ -26,7 +26,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-ipx.h"
diff --git a/epan/dissectors/packet-irc.c b/epan/dissectors/packet-irc.c
index 37d73a03e8..13ae12e05b 100644
--- a/epan/dissectors/packet-irc.c
+++ b/epan/dissectors/packet-irc.c
@@ -41,7 +41,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 
diff --git a/epan/dissectors/packet-isis-hello.c b/epan/dissectors/packet-isis-hello.c
index a94119a3e9..f95bcbfcc4 100644
--- a/epan/dissectors/packet-isis-hello.c
+++ b/epan/dissectors/packet-isis-hello.c
@@ -27,7 +27,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-osi.h"
diff --git a/epan/dissectors/packet-isis-lsp.c b/epan/dissectors/packet-isis-lsp.c
index ae2057d503..abf2083949 100644
--- a/epan/dissectors/packet-isis-lsp.c
+++ b/epan/dissectors/packet-isis-lsp.c
@@ -27,7 +27,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 
 #include <epan/ipv4.h>
diff --git a/epan/dissectors/packet-isis-snp.c b/epan/dissectors/packet-isis-snp.c
index 7d248e3334..ac3f7ad9e0 100644
--- a/epan/dissectors/packet-isis-snp.c
+++ b/epan/dissectors/packet-isis-snp.c
@@ -27,7 +27,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-osi.h"
diff --git a/epan/dissectors/packet-isis.c b/epan/dissectors/packet-isis.c
index b3ca38803e..1b60ec854d 100644
--- a/epan/dissectors/packet-isis.c
+++ b/epan/dissectors/packet-isis.c
@@ -28,7 +28,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/nlpid.h>
diff --git a/epan/dissectors/packet-ismp.c b/epan/dissectors/packet-ismp.c
index 2921c43277..8035c990ea 100644
--- a/epan/dissectors/packet-ismp.c
+++ b/epan/dissectors/packet-ismp.c
@@ -29,7 +29,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-iwarp-ddp-rdmap.c b/epan/dissectors/packet-iwarp-ddp-rdmap.c
index d1dfd005b0..99a5c78fdb 100644
--- a/epan/dissectors/packet-iwarp-ddp-rdmap.c
+++ b/epan/dissectors/packet-iwarp-ddp-rdmap.c
@@ -32,7 +32,6 @@
 # include "config.h" 
 #endif
 #include <stdlib.h> 
-#include <string.h> 
 #include <glib.h> 
 #include <epan/packet.h> 
 
diff --git a/epan/dissectors/packet-jabber.c b/epan/dissectors/packet-jabber.c
index 9114483f6c..ec990846ad 100644
--- a/epan/dissectors/packet-jabber.c
+++ b/epan/dissectors/packet-jabber.c
@@ -31,7 +31,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/strutil.h>
diff --git a/epan/dissectors/packet-jpeg.c b/epan/dissectors/packet-jpeg.c
index dedde587e1..75f5eb7915 100644
--- a/epan/dissectors/packet-jpeg.c
+++ b/epan/dissectors/packet-jpeg.c
@@ -35,8 +35,6 @@
 #include <glib.h>
 #include <epan/packet.h>
 
-#include <string.h>
-
 #include <epan/rtp_pt.h>
 
 
diff --git a/epan/dissectors/packet-kink.c b/epan/dissectors/packet-kink.c
index e144213359..3609b0bf07 100644
--- a/epan/dissectors/packet-kink.c
+++ b/epan/dissectors/packet-kink.c
@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/asn1.h>
diff --git a/epan/dissectors/packet-l1-events.c b/epan/dissectors/packet-l1-events.c
index 3855ac7d9c..f88d7e7e52 100644
--- a/epan/dissectors/packet-l1-events.c
+++ b/epan/dissectors/packet-l1-events.c
@@ -33,7 +33,6 @@
 #include "config.h"
 #endif
 
-#include <string.h>
 #include <ctype.h>
 
 #include <glib.h>
diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c
index 1bbc056c3e..908ad87998 100644
--- a/epan/dissectors/packet-l2tp.c
+++ b/epan/dissectors/packet-l2tp.c
@@ -95,7 +95,6 @@ static int hf_l2tp_cisco_avp_type = -1;
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 #include <glib.h>
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-lapb.c b/epan/dissectors/packet-lapb.c
index 5058c6d086..b5db50c200 100644
--- a/epan/dissectors/packet-lapb.c
+++ b/epan/dissectors/packet-lapb.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <glib.h>
-#include <string.h>
 #include <epan/packet.h>
 #include <epan/xdlc.h>
 
diff --git a/epan/dissectors/packet-lapbether.c b/epan/dissectors/packet-lapbether.c
index d94b87558e..91c43e2322 100644
--- a/epan/dissectors/packet-lapbether.c
+++ b/epan/dissectors/packet-lapbether.c
@@ -29,7 +29,6 @@
 #endif
 
 #include <glib.h>
-#include <string.h>
 #include <epan/packet.h>
 #include <epan/etypes.h>
 
diff --git a/epan/dissectors/packet-lapdm.c b/epan/dissectors/packet-lapdm.c
index e95d6724eb..2a5d937dc1 100644
--- a/epan/dissectors/packet-lapdm.c
+++ b/epan/dissectors/packet-lapdm.c
@@ -56,7 +56,6 @@
 #endif
 
 #include <glib.h>
-#include <string.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/xdlc.h>
diff --git a/epan/dissectors/packet-laplink.c b/epan/dissectors/packet-laplink.c
index 7b06200083..d30737c67d 100644
--- a/epan/dissectors/packet-laplink.c
+++ b/epan/dissectors/packet-laplink.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-lge_monitor.c b/epan/dissectors/packet-lge_monitor.c
index 07c912321e..771c171e4e 100644
--- a/epan/dissectors/packet-lge_monitor.c
+++ b/epan/dissectors/packet-lge_monitor.c
@@ -30,7 +30,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-llt.c b/epan/dissectors/packet-llt.c
index 94d3fb5286..5af5fbc8b3 100644
--- a/epan/dissectors/packet-llt.c
+++ b/epan/dissectors/packet-llt.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-lmi.c b/epan/dissectors/packet-lmi.c
index 1d0745c3be..6c48969a1e 100644
--- a/epan/dissectors/packet-lmi.c
+++ b/epan/dissectors/packet-lmi.c
@@ -39,7 +39,6 @@
 #endif
 
 #include <glib.h>
-#include <string.h>
 #include <epan/packet.h>
 #include <epan/nlpid.h>
 
diff --git a/epan/dissectors/packet-lmp.c b/epan/dissectors/packet-lmp.c
index 1fa48f2311..74f9d5d49c 100644
--- a/epan/dissectors/packet-lmp.c
+++ b/epan/dissectors/packet-lmp.c
@@ -49,7 +49,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-lpd.c b/epan/dissectors/packet-lpd.c
index 5cc4d4f15f..ca9a7efb09 100644
--- a/epan/dissectors/packet-lpd.c
+++ b/epan/dissectors/packet-lpd.c
@@ -27,8 +27,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 
diff --git a/epan/dissectors/packet-lsc.c b/epan/dissectors/packet-lsc.c
index dca7807265..8c7a151e02 100644
--- a/epan/dissectors/packet-lsc.c
+++ b/epan/dissectors/packet-lsc.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-m3ua.c b/epan/dissectors/packet-m3ua.c
index 1f966b8460..71e074d8c2 100644
--- a/epan/dissectors/packet-m3ua.c
+++ b/epan/dissectors/packet-m3ua.c
@@ -38,7 +38,6 @@
 #include <stdlib.h>
 
 
-#include <string.h>
 #include <glib.h>
 
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-mbtcp.c b/epan/dissectors/packet-mbtcp.c
index a9a468ae76..5d058bf1c5 100644
--- a/epan/dissectors/packet-mbtcp.c
+++ b/epan/dissectors/packet-mbtcp.c
@@ -36,7 +36,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-mdshdr.c b/epan/dissectors/packet-mdshdr.c
index b6f0069ddf..57ad20cd06 100644
--- a/epan/dissectors/packet-mdshdr.c
+++ b/epan/dissectors/packet-mdshdr.c
@@ -34,7 +34,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
diff --git a/epan/dissectors/packet-mesh.c b/epan/dissectors/packet-mesh.c
index b7cfae5f3a..15208e8894 100644
--- a/epan/dissectors/packet-mesh.c
+++ b/epan/dissectors/packet-mesh.c
@@ -29,7 +29,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-mikey.c b/epan/dissectors/packet-mikey.c
index af9518cad6..ec3880038d 100644
--- a/epan/dissectors/packet-mikey.c
+++ b/epan/dissectors/packet-mikey.c
@@ -40,7 +40,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-miop.c b/epan/dissectors/packet-miop.c
index 1bcf5d1999..f8ec52cf3f 100644
--- a/epan/dissectors/packet-miop.c
+++ b/epan/dissectors/packet-miop.c
@@ -34,7 +34,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <errno.h>
 #include <ctype.h>
 #include <glib.h>
diff --git a/epan/dissectors/packet-mip.c b/epan/dissectors/packet-mip.c
index e2352f70d3..211b328f56 100644
--- a/epan/dissectors/packet-mip.c
+++ b/epan/dissectors/packet-mip.c
@@ -32,7 +32,6 @@
 
 #include <stdlib.h>
 
-#include <string.h>
 #include <glib.h>
 #include <time.h>
 
diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c
index a871b63e19..374f6988dd 100644
--- a/epan/dissectors/packet-mp2t.c
+++ b/epan/dissectors/packet-mp2t.c
@@ -32,8 +32,6 @@
 #include <glib.h>
 #include <epan/packet.h>
 
-#include <string.h>
-
 #include <epan/rtp_pt.h>
 #include "packet-frame.h"
 
diff --git a/epan/dissectors/packet-mpeg1.c b/epan/dissectors/packet-mpeg1.c
index d09d59ce23..445edc05b2 100644
--- a/epan/dissectors/packet-mpeg1.c
+++ b/epan/dissectors/packet-mpeg1.c
@@ -38,8 +38,6 @@
 #include <glib.h>
 #include <epan/packet.h>
 
-#include <string.h>
-
 #include <epan/rtp_pt.h>
 
 #define RTP_MPG_MBZ(word) ( word >> 11)
diff --git a/epan/dissectors/packet-mpls-echo.c b/epan/dissectors/packet-mpls-echo.c
index 294359d1a8..c0bdd336a5 100644
--- a/epan/dissectors/packet-mpls-echo.c
+++ b/epan/dissectors/packet-mpls-echo.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-mrdisc.c b/epan/dissectors/packet-mrdisc.c
index 6b5d07e5bd..adba262115 100644
--- a/epan/dissectors/packet-mrdisc.c
+++ b/epan/dissectors/packet-mrdisc.c
@@ -40,7 +40,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-msdp.c b/epan/dissectors/packet-msdp.c
index 7d9ade672f..0efab0f040 100644
--- a/epan/dissectors/packet-msdp.c
+++ b/epan/dissectors/packet-msdp.c
@@ -30,7 +30,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-msn-messenger.c b/epan/dissectors/packet-msn-messenger.c
index 39e765da20..b5b647a475 100644
--- a/epan/dissectors/packet-msn-messenger.c
+++ b/epan/dissectors/packet-msn-messenger.c
@@ -29,7 +29,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/strutil.h>
diff --git a/epan/dissectors/packet-msnip.c b/epan/dissectors/packet-msnip.c
index 4c7ea22ed5..47b9de6850 100644
--- a/epan/dissectors/packet-msnip.c
+++ b/epan/dissectors/packet-msnip.c
@@ -39,7 +39,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-mstp.c b/epan/dissectors/packet-mstp.c
index 844da3538d..51113d31ce 100644
--- a/epan/dissectors/packet-mstp.c
+++ b/epan/dissectors/packet-mstp.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-nbd.c b/epan/dissectors/packet-nbd.c
index 0a969dbfda..121feb9f5c 100644
--- a/epan/dissectors/packet-nbd.c
+++ b/epan/dissectors/packet-nbd.c
@@ -29,7 +29,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-ncp-nmas.c b/epan/dissectors/packet-ncp-nmas.c
index cc51d32c93..ba70a11fda 100644
--- a/epan/dissectors/packet-ncp-nmas.c
+++ b/epan/dissectors/packet-ncp-nmas.c
@@ -28,7 +28,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/emem.h>
diff --git a/epan/dissectors/packet-ncp-sss.c b/epan/dissectors/packet-ncp-sss.c
index bd0d5d2d36..9dc5f8a58e 100644
--- a/epan/dissectors/packet-ncp-sss.c
+++ b/epan/dissectors/packet-ncp-sss.c
@@ -28,7 +28,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/strutil.h>
diff --git a/epan/dissectors/packet-netdump.c b/epan/dissectors/packet-netdump.c
index d4b0f6d279..51816d599b 100644
--- a/epan/dissectors/packet-netdump.c
+++ b/epan/dissectors/packet-netdump.c
@@ -29,7 +29,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-netsync.c b/epan/dissectors/packet-netsync.c
index f8b11fff72..4b744ee914 100644
--- a/epan/dissectors/packet-netsync.c
+++ b/epan/dissectors/packet-netsync.c
@@ -33,7 +33,6 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <time.h>
-#include <string.h>
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-nettl.c b/epan/dissectors/packet-nettl.c
index 0890450a5b..ada9161cb9 100644
--- a/epan/dissectors/packet-nettl.c
+++ b/epan/dissectors/packet-nettl.c
@@ -31,7 +31,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/ipproto.h>
diff --git a/epan/dissectors/packet-newmail.c b/epan/dissectors/packet-newmail.c
index 77c3e3b919..b5f794825a 100644
--- a/epan/dissectors/packet-newmail.c
+++ b/epan/dissectors/packet-newmail.c
@@ -34,7 +34,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-nlsp.c b/epan/dissectors/packet-nlsp.c
index 764f77be1e..2e094fe303 100644
--- a/epan/dissectors/packet-nlsp.c
+++ b/epan/dissectors/packet-nlsp.c
@@ -28,7 +28,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-ipx.h"
diff --git a/epan/dissectors/packet-nntp.c b/epan/dissectors/packet-nntp.c
index 56634cdb0d..f286496e0a 100644
--- a/epan/dissectors/packet-nntp.c
+++ b/epan/dissectors/packet-nntp.c
@@ -27,7 +27,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/strutil.h>
diff --git a/epan/dissectors/packet-nsip.c b/epan/dissectors/packet-nsip.c
index 7d167fd0d8..895b135ea5 100644
--- a/epan/dissectors/packet-nsip.c
+++ b/epan/dissectors/packet-nsip.c
@@ -30,7 +30,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-nstrace.c b/epan/dissectors/packet-nstrace.c
index 7ff5173aad..da7ebc1717 100644
--- a/epan/dissectors/packet-nstrace.c
+++ b/epan/dissectors/packet-nstrace.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <glib.h>
-#include <string.h>
 #include <epan/packet.h>
 #include <wiretap/netscaler.h>
 
diff --git a/epan/dissectors/packet-nt-sonmp.c b/epan/dissectors/packet-nt-sonmp.c
index 449ea18689..b892f55326 100644
--- a/epan/dissectors/packet-nt-sonmp.c
+++ b/epan/dissectors/packet-nt-sonmp.c
@@ -30,7 +30,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-opsi.c b/epan/dissectors/packet-opsi.c
index f196322d00..ecf9e4aae0 100644
--- a/epan/dissectors/packet-opsi.c
+++ b/epan/dissectors/packet-opsi.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-osi-options.c b/epan/dissectors/packet-osi-options.c
index 672b3c8ff5..c33043c6a2 100644
--- a/epan/dissectors/packet-osi-options.c
+++ b/epan/dissectors/packet-osi-options.c
@@ -31,7 +31,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/nlpid.h>
diff --git a/epan/dissectors/packet-osi.c b/epan/dissectors/packet-osi.c
index ee9043649e..69383c3f6f 100644
--- a/epan/dissectors/packet-osi.c
+++ b/epan/dissectors/packet-osi.c
@@ -29,7 +29,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <ctype.h>
 #include <glib.h>
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-ositp.c b/epan/dissectors/packet-ositp.c
index 655a4c1707..a5d68532b7 100644
--- a/epan/dissectors/packet-ositp.c
+++ b/epan/dissectors/packet-ositp.c
@@ -27,7 +27,6 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-#include <string.h>
 #include <ctype.h>
 #include <glib.h>
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-pagp.c b/epan/dissectors/packet-pagp.c
index db53928de5..43f779496a 100644
--- a/epan/dissectors/packet-pagp.c
+++ b/epan/dissectors/packet-pagp.c
@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/etypes.h>
diff --git a/epan/dissectors/packet-pana.c b/epan/dissectors/packet-pana.c
index 674246f921..a0bfc5fc20 100644
--- a/epan/dissectors/packet-pana.c
+++ b/epan/dissectors/packet-pana.c
@@ -33,7 +33,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-pcep.c b/epan/dissectors/packet-pcep.c
index d28c865d61..fd06257b29 100644
--- a/epan/dissectors/packet-pcep.c
+++ b/epan/dissectors/packet-pcep.c
@@ -32,7 +32,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-pcli.c b/epan/dissectors/packet-pcli.c
index c2da0460ba..bc7bfd6140 100644
--- a/epan/dissectors/packet-pcli.c
+++ b/epan/dissectors/packet-pcli.c
@@ -36,7 +36,6 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <time.h>
-#include <string.h>
 
 #include <glib.h>
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-pktgen.c b/epan/dissectors/packet-pktgen.c
index 2421a28a7c..3d34195624 100644
--- a/epan/dissectors/packet-pktgen.c
+++ b/epan/dissectors/packet-pktgen.c
@@ -35,7 +35,6 @@
 
 #if 0
 #include <stdlib.h>
-#include <string.h>
 #endif
 
 #include <glib.h>
diff --git a/epan/dissectors/packet-ppi.c b/epan/dissectors/packet-ppi.c
index 23e95f5102..2b92bf6161 100644
--- a/epan/dissectors/packet-ppi.c
+++ b/epan/dissectors/packet-ppi.c
@@ -51,7 +51,6 @@
 #endif
 
 #include <glib.h>
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/ptvcursor.h>
diff --git a/epan/dissectors/packet-prp.c b/epan/dissectors/packet-prp.c
index edcbf87771..91e3c02b43 100644
--- a/epan/dissectors/packet-prp.c
+++ b/epan/dissectors/packet-prp.c
@@ -33,7 +33,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/etypes.h>
diff --git a/epan/dissectors/packet-ptp.c b/epan/dissectors/packet-ptp.c
index daee68140c..b355c63cef 100644
--- a/epan/dissectors/packet-ptp.c
+++ b/epan/dissectors/packet-ptp.c
@@ -42,7 +42,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 #include <math.h>
 
 
diff --git a/epan/dissectors/packet-pw-cesopsn.c b/epan/dissectors/packet-pw-cesopsn.c
index b6cbf4bf76..816595c0b0 100644
--- a/epan/dissectors/packet-pw-cesopsn.c
+++ b/epan/dissectors/packet-pw-cesopsn.c
@@ -37,7 +37,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/expert.h>
diff --git a/epan/dissectors/packet-pw-common.c b/epan/dissectors/packet-pw-common.c
index fd1b109a96..6144947e13 100644
--- a/epan/dissectors/packet-pw-common.c
+++ b/epan/dissectors/packet-pw-common.c
@@ -27,7 +27,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <epan/packet.h>
 #include "packet-pw-common.h"
 
diff --git a/epan/dissectors/packet-pw-eth.c b/epan/dissectors/packet-pw-eth.c
index a62cb7f953..aab32e0687 100644
--- a/epan/dissectors/packet-pw-eth.c
+++ b/epan/dissectors/packet-pw-eth.c
@@ -31,7 +31,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
diff --git a/epan/dissectors/packet-pw-hdlc.c b/epan/dissectors/packet-pw-hdlc.c
index 976b4cded9..c3b932d548 100644
--- a/epan/dissectors/packet-pw-hdlc.c
+++ b/epan/dissectors/packet-pw-hdlc.c
@@ -39,7 +39,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 
diff --git a/epan/dissectors/packet-pw-satop.c b/epan/dissectors/packet-pw-satop.c
index fa1770d7de..cddb495be2 100644
--- a/epan/dissectors/packet-pw-satop.c
+++ b/epan/dissectors/packet-pw-satop.c
@@ -36,7 +36,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/expert.h>
diff --git a/epan/dissectors/packet-radiotap.c b/epan/dissectors/packet-radiotap.c
index f35604aaa9..12805d7aa8 100644
--- a/epan/dissectors/packet-radiotap.c
+++ b/epan/dissectors/packet-radiotap.c
@@ -30,7 +30,6 @@
 #endif
 
 #include <glib.h>
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/crc32.h>
diff --git a/epan/dissectors/packet-rdt.c b/epan/dissectors/packet-rdt.c
index 4fb52d3f0b..49e39dc7c1 100644
--- a/epan/dissectors/packet-rdt.c
+++ b/epan/dissectors/packet-rdt.c
@@ -37,7 +37,6 @@
 #endif
 
 #include <glib.h>
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/conversation.h>
diff --git a/epan/dissectors/packet-redbackli.c b/epan/dissectors/packet-redbackli.c
index 0637e6e141..deb38a1829 100644
--- a/epan/dissectors/packet-redbackli.c
+++ b/epan/dissectors/packet-redbackli.c
@@ -32,7 +32,6 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <time.h>
-#include <string.h>
 
 #include <glib.h>
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-retix-bpdu.c b/epan/dissectors/packet-retix-bpdu.c
index 77229e8d3a..9865646341 100644
--- a/epan/dissectors/packet-retix-bpdu.c
+++ b/epan/dissectors/packet-retix-bpdu.c
@@ -29,7 +29,6 @@
 #endif
 
 #if 0
-#include <string.h>
 #endif
 #include <glib.h>
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-rfc2190.c b/epan/dissectors/packet-rfc2190.c
index 17fcbc96a1..7cb6cafac4 100644
--- a/epan/dissectors/packet-rfc2190.c
+++ b/epan/dissectors/packet-rfc2190.c
@@ -41,8 +41,6 @@
 #include <glib.h>
 #include <epan/packet.h>
 
-#include <string.h>
-
 #include <epan/rtp_pt.h>
 #include <epan/iax2_codec_type.h>
 
diff --git a/epan/dissectors/packet-rip.c b/epan/dissectors/packet-rip.c
index 7f7b460e92..748c1b1c9b 100644
--- a/epan/dissectors/packet-rip.c
+++ b/epan/dissectors/packet-rip.c
@@ -29,7 +29,6 @@
 
 #include "config.h"
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/emem.h>
diff --git a/epan/dissectors/packet-rlm.c b/epan/dissectors/packet-rlm.c
index 1276045d2a..24440e4aa1 100644
--- a/epan/dissectors/packet-rlm.c
+++ b/epan/dissectors/packet-rlm.c
@@ -52,7 +52,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-rmt-fec.c b/epan/dissectors/packet-rmt-fec.c
index be1f902a52..811c86bc2a 100644
--- a/epan/dissectors/packet-rmt-fec.c
+++ b/epan/dissectors/packet-rmt-fec.c
@@ -43,7 +43,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-rmt-lct.c b/epan/dissectors/packet-rmt-lct.c
index de6f258775..16b7f31349 100644
--- a/epan/dissectors/packet-rmt-lct.c
+++ b/epan/dissectors/packet-rmt-lct.c
@@ -43,7 +43,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-rsl.c b/epan/dissectors/packet-rsl.c
index 6b497c02d9..b10a671e5d 100644
--- a/epan/dissectors/packet-rsl.c
+++ b/epan/dissectors/packet-rsl.c
@@ -35,7 +35,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-rtmpt.c b/epan/dissectors/packet-rtmpt.c
index 155c6162fd..1eb1956429 100644
--- a/epan/dissectors/packet-rtmpt.c
+++ b/epan/dissectors/packet-rtmpt.c
@@ -44,8 +44,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
diff --git a/epan/dissectors/packet-rtnet.c b/epan/dissectors/packet-rtnet.c
index 0a7d08dc8c..96ae14e5e4 100644
--- a/epan/dissectors/packet-rtnet.c
+++ b/epan/dissectors/packet-rtnet.c
@@ -34,7 +34,6 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <time.h>
-#include <string.h>
 
 #include <glib.h>
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-rtp-events.c b/epan/dissectors/packet-rtp-events.c
index 386d6a8da0..620756717a 100644
--- a/epan/dissectors/packet-rtp-events.c
+++ b/epan/dissectors/packet-rtp-events.c
@@ -43,7 +43,6 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 
-#include <string.h>
 #include "packet-rtp-events.h"
 #include "packet-rtp.h"
 #include <epan/tap.h>
diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c
index 571994bd3e..369056a5db 100644
--- a/epan/dissectors/packet-rtp.c
+++ b/epan/dissectors/packet-rtp.c
@@ -64,7 +64,6 @@
 #include <epan/packet.h>
 
 #include <stdio.h>
-#include <string.h>
 
 #include "packet-rtp.h"
 #include <epan/rtp_pt.h>
diff --git a/epan/dissectors/packet-rx.c b/epan/dissectors/packet-rx.c
index fbc5d0257e..0e2eabdc99 100644
--- a/epan/dissectors/packet-rx.c
+++ b/epan/dissectors/packet-rx.c
@@ -31,7 +31,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-rx.h"
diff --git a/epan/dissectors/packet-sccpmg.c b/epan/dissectors/packet-sccpmg.c
index 1549e0c08a..d134e76216 100644
--- a/epan/dissectors/packet-sccpmg.c
+++ b/epan/dissectors/packet-sccpmg.c
@@ -38,7 +38,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-scsi-mmc.c b/epan/dissectors/packet-scsi-mmc.c
index bbf5a26655..685c72139c 100644
--- a/epan/dissectors/packet-scsi-mmc.c
+++ b/epan/dissectors/packet-scsi-mmc.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <glib.h>
-#include <string.h>
 #include <epan/strutil.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
diff --git a/epan/dissectors/packet-scsi-osd.c b/epan/dissectors/packet-scsi-osd.c
index 1b6a51536f..6ab6914ac6 100644
--- a/epan/dissectors/packet-scsi-osd.c
+++ b/epan/dissectors/packet-scsi-osd.c
@@ -30,7 +30,6 @@
 #endif
 
 #include <glib.h>
-#include <string.h>
 #include <epan/strutil.h>
 #include <epan/packet.h>
 #include <epan/emem.h>
diff --git a/epan/dissectors/packet-scsi-sbc.c b/epan/dissectors/packet-scsi-sbc.c
index f3ed3f404a..5e0a5e90b1 100644
--- a/epan/dissectors/packet-scsi-sbc.c
+++ b/epan/dissectors/packet-scsi-sbc.c
@@ -41,7 +41,6 @@
 #endif
 
 #include <glib.h>
-#include <string.h>
 #include <epan/strutil.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
diff --git a/epan/dissectors/packet-scsi-ssc.c b/epan/dissectors/packet-scsi-ssc.c
index a095962e1e..15a6df8658 100644
--- a/epan/dissectors/packet-scsi-ssc.c
+++ b/epan/dissectors/packet-scsi-ssc.c
@@ -36,7 +36,6 @@
 #endif
 
 #include <glib.h>
-#include <string.h>
 #include <epan/strutil.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c
index 958fa74b6c..220de7b2bd 100644
--- a/epan/dissectors/packet-scsi.c
+++ b/epan/dissectors/packet-scsi.c
@@ -84,7 +84,6 @@
 #endif
 
 #include <glib.h>
-#include <string.h>
 #include <epan/strutil.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-sdlc.c b/epan/dissectors/packet-sdlc.c
index c4940d1664..ea9d9aedd3 100644
--- a/epan/dissectors/packet-sdlc.c
+++ b/epan/dissectors/packet-sdlc.c
@@ -27,7 +27,6 @@
 #endif
 
 #include <glib.h>
-#include <string.h>
 #include <epan/packet.h>
 #include <epan/xdlc.h>
 
diff --git a/epan/dissectors/packet-ses.c b/epan/dissectors/packet-ses.c
index a7ed9ae305..08a9a901aa 100644
--- a/epan/dissectors/packet-ses.c
+++ b/epan/dissectors/packet-ses.c
@@ -32,8 +32,6 @@
 #include <glib.h>
 #include <epan/packet.h>
 
-#include <string.h>
-
 #include <epan/asn1.h>
 #include "packet-ber.h"
 #include "packet-ses.h"
diff --git a/epan/dissectors/packet-sll.c b/epan/dissectors/packet-sll.c
index 3937536fc8..fe49d212f7 100644
--- a/epan/dissectors/packet-sll.c
+++ b/epan/dissectors/packet-sll.c
@@ -26,7 +26,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 #include <epan/arptypes.h>
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-smb-browse.c b/epan/dissectors/packet-smb-browse.c
index 02c6008d34..ba965516d8 100644
--- a/epan/dissectors/packet-smb-browse.c
+++ b/epan/dissectors/packet-smb-browse.c
@@ -30,7 +30,6 @@
 #endif
 
 #include <time.h>
-#include <string.h>
 #include <glib.h>
 #include <ctype.h>
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-sndcp-xid.c b/epan/dissectors/packet-sndcp-xid.c
index 4dbea3d296..b214e97204 100644
--- a/epan/dissectors/packet-sndcp-xid.c
+++ b/epan/dissectors/packet-sndcp-xid.c
@@ -29,7 +29,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-sndcp.c b/epan/dissectors/packet-sndcp.c
index 1f8ae15b74..935de3efbe 100644
--- a/epan/dissectors/packet-sndcp.c
+++ b/epan/dissectors/packet-sndcp.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-sscf-nni.c b/epan/dissectors/packet-sscf-nni.c
index 3b43a9beb8..a92f16984c 100644
--- a/epan/dissectors/packet-sscf-nni.c
+++ b/epan/dissectors/packet-sscf-nni.c
@@ -30,7 +30,6 @@
 #endif
 
 #include <glib.h>
-#include <string.h>
 #include <epan/packet.h>
 
 static int proto_sscf = -1;
diff --git a/epan/dissectors/packet-sscop.c b/epan/dissectors/packet-sscop.c
index 3551427306..66b78241ce 100644
--- a/epan/dissectors/packet-sscop.c
+++ b/epan/dissectors/packet-sscop.c
@@ -29,7 +29,6 @@
 #endif
 
 #include <glib.h>
-#include <string.h>
 #include <epan/packet.h>
 #include <prefs.h>
 #include "packet-sscop.h"
diff --git a/epan/dissectors/packet-starteam.c b/epan/dissectors/packet-starteam.c
index cea4d782f8..455d9a441f 100644
--- a/epan/dissectors/packet-starteam.c
+++ b/epan/dissectors/packet-starteam.c
@@ -33,8 +33,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
diff --git a/epan/dissectors/packet-teamspeak2.c b/epan/dissectors/packet-teamspeak2.c
index c2046caf5e..946f64044b 100644
--- a/epan/dissectors/packet-teamspeak2.c
+++ b/epan/dissectors/packet-teamspeak2.c
@@ -33,7 +33,6 @@
 #include <epan/reassemble.h>
 #include <epan/conversation.h>
 #include <stdlib.h>
-#include <string.h>
 
 
 /* Packet Classes */
diff --git a/epan/dissectors/packet-teimanagement.c b/epan/dissectors/packet-teimanagement.c
index bdf6741f51..e86ccef523 100644
--- a/epan/dissectors/packet-teimanagement.c
+++ b/epan/dissectors/packet-teimanagement.c
@@ -29,7 +29,6 @@
 #endif
 
 #include <glib.h>
-#include <string.h>
 #include <epan/packet.h>
 #include <epan/lapd_sapi.h>
 
diff --git a/epan/dissectors/packet-text-media.c b/epan/dissectors/packet-text-media.c
index 421fce3d68..5e97288165 100644
--- a/epan/dissectors/packet-text-media.c
+++ b/epan/dissectors/packet-text-media.c
@@ -36,7 +36,6 @@
 #include "config.h"
 #endif
 
-#include <string.h>
 #include <ctype.h>
 
 #include <glib.h>
diff --git a/epan/dissectors/packet-tftp.c b/epan/dissectors/packet-tftp.c
index 2fce1eaa0a..d6a9f138cd 100644
--- a/epan/dissectors/packet-tftp.c
+++ b/epan/dissectors/packet-tftp.c
@@ -46,7 +46,6 @@
 
 #include <glib.h>
 #include <stdlib.h>
-#include <string.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <epan/emem.h>
diff --git a/epan/dissectors/packet-tnef.c b/epan/dissectors/packet-tnef.c
index f36e46d16d..d3298208df 100644
--- a/epan/dissectors/packet-tnef.c
+++ b/epan/dissectors/packet-tnef.c
@@ -32,7 +32,6 @@
 #include <ctype.h>
 #include <time.h>
 #include <glib.h>
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
diff --git a/epan/dissectors/packet-tns.c b/epan/dissectors/packet-tns.c
index 05428ab5c1..8596dd9dfb 100644
--- a/epan/dissectors/packet-tns.c
+++ b/epan/dissectors/packet-tns.c
@@ -28,7 +28,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-tcp.h"
diff --git a/epan/dissectors/packet-tte-pcf.c b/epan/dissectors/packet-tte-pcf.c
index b7a15edb70..c803835287 100644
--- a/epan/dissectors/packet-tte-pcf.c
+++ b/epan/dissectors/packet-tte-pcf.c
@@ -34,7 +34,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 #include <glib.h>
 
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-turbocell.c b/epan/dissectors/packet-turbocell.c
index 812ed1cb74..e76c444fcd 100644
--- a/epan/dissectors/packet-turbocell.c
+++ b/epan/dissectors/packet-turbocell.c
@@ -40,7 +40,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-turnchannel.c b/epan/dissectors/packet-turnchannel.c
index 5bfd143b85..d49f544236 100644
--- a/epan/dissectors/packet-turnchannel.c
+++ b/epan/dissectors/packet-turnchannel.c
@@ -36,7 +36,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-ucp.c b/epan/dissectors/packet-ucp.c
index 4c2cdf32d0..49c94201de 100644
--- a/epan/dissectors/packet-ucp.c
+++ b/epan/dissectors/packet-ucp.c
@@ -39,7 +39,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 #include <time.h>
 
diff --git a/epan/dissectors/packet-udld.c b/epan/dissectors/packet-udld.c
index 65165696f4..790f48cb0c 100644
--- a/epan/dissectors/packet-udld.c
+++ b/epan/dissectors/packet-udld.c
@@ -27,7 +27,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-uma.c b/epan/dissectors/packet-uma.c
index 3716eee7bb..b5c1bc0357 100644
--- a/epan/dissectors/packet-uma.c
+++ b/epan/dissectors/packet-uma.c
@@ -58,7 +58,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 #include <epan/conversation.h>
diff --git a/epan/dissectors/packet-usb-hub.c b/epan/dissectors/packet-usb-hub.c
index ec7915332e..657a68e9f9 100644
--- a/epan/dissectors/packet-usb-hub.c
+++ b/epan/dissectors/packet-usb-hub.c
@@ -33,7 +33,6 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include <string.h>
 #include "packet-usb.h"
 
 /* protocols and header fields */
diff --git a/epan/dissectors/packet-usb-masstorage.c b/epan/dissectors/packet-usb-masstorage.c
index 1fc01aa9c7..fc333ac2f4 100644
--- a/epan/dissectors/packet-usb-masstorage.c
+++ b/epan/dissectors/packet-usb-masstorage.c
@@ -29,7 +29,6 @@
 #include <epan/packet.h>
 #include <epan/emem.h>
 #include <epan/conversation.h>
-#include <string.h>
 #include "packet-usb.h"
 #include "packet-scsi.h"
 
diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c
index e35b32fa31..ace2635c08 100644
--- a/epan/dissectors/packet-usb.c
+++ b/epan/dissectors/packet-usb.c
@@ -34,7 +34,6 @@
 #include <epan/tap.h>
 #include <epan/conversation.h>
 #include <epan/expert.h>
-#include <string.h>
 #include "packet-usb.h"
 #include "packet-usb-hid.h"
 
diff --git a/epan/dissectors/packet-uts.c b/epan/dissectors/packet-uts.c
index 7da0fb220d..0c90b334a5 100644
--- a/epan/dissectors/packet-uts.c
+++ b/epan/dissectors/packet-uts.c
@@ -32,7 +32,6 @@
 #endif
 
 #include <glib.h>
-#include <string.h>
 #include <epan/packet.h>
 #include <epan/emem.h>
 
diff --git a/epan/dissectors/packet-v120.c b/epan/dissectors/packet-v120.c
index f3388fd307..620be56e08 100644
--- a/epan/dissectors/packet-v120.c
+++ b/epan/dissectors/packet-v120.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <glib.h>
-#include <string.h>
 #include <epan/packet.h>
 #include <epan/xdlc.h>
 #include <epan/emem.h>
diff --git a/epan/dissectors/packet-v5ua.c b/epan/dissectors/packet-v5ua.c
index 8f8239e9da..9070b30dcf 100644
--- a/epan/dissectors/packet-v5ua.c
+++ b/epan/dissectors/packet-v5ua.c
@@ -46,7 +46,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 
 #include <glib.h>
diff --git a/epan/dissectors/packet-vrrp.c b/epan/dissectors/packet-vrrp.c
index 9caaba0bf0..af6fee347c 100644
--- a/epan/dissectors/packet-vrrp.c
+++ b/epan/dissectors/packet-vrrp.c
@@ -30,7 +30,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/ipproto.h>
diff --git a/epan/dissectors/packet-vtp.c b/epan/dissectors/packet-vtp.c
index 3d585e32b2..b116adb2b4 100644
--- a/epan/dissectors/packet-vtp.c
+++ b/epan/dissectors/packet-vtp.c
@@ -25,7 +25,6 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-who.c b/epan/dissectors/packet-who.c
index a5d98c5d11..f3be5049d1 100644
--- a/epan/dissectors/packet-who.c
+++ b/epan/dissectors/packet-who.c
@@ -27,7 +27,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <time.h>
 #include <glib.h>
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-winsrepl.c b/epan/dissectors/packet-winsrepl.c
index a017e2d9a1..f82f3dacef 100644
--- a/epan/dissectors/packet-winsrepl.c
+++ b/epan/dissectors/packet-winsrepl.c
@@ -31,7 +31,6 @@
 #endif
 
 #include <time.h>
-#include <string.h>
 #include <glib.h>
 #include <ctype.h>
 #include <epan/packet.h>
diff --git a/epan/dissectors/packet-wlccp.c b/epan/dissectors/packet-wlccp.c
index b11186003e..f81914d013 100644
--- a/epan/dissectors/packet-wlccp.c
+++ b/epan/dissectors/packet-wlccp.c
@@ -64,7 +64,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-wol.c b/epan/dissectors/packet-wol.c
index 6875a993c7..e4481e2749 100644
--- a/epan/dissectors/packet-wol.c
+++ b/epan/dissectors/packet-wol.c
@@ -60,7 +60,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-wsmp.c b/epan/dissectors/packet-wsmp.c
index c34bd54cf0..eee775433c 100644
--- a/epan/dissectors/packet-wsmp.c
+++ b/epan/dissectors/packet-wsmp.c
@@ -30,7 +30,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <epan/packet.h>
 #include <epan/etypes.h>
diff --git a/epan/dissectors/packet-wtls.c b/epan/dissectors/packet-wtls.c
index 7dbe73ff23..d008c439e3 100644
--- a/epan/dissectors/packet-wtls.c
+++ b/epan/dissectors/packet-wtls.c
@@ -34,7 +34,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-wap.h"
diff --git a/epan/dissectors/packet-wtp.c b/epan/dissectors/packet-wtp.c
index 77f2ccdc28..ae923619aa 100644
--- a/epan/dissectors/packet-wtp.c
+++ b/epan/dissectors/packet-wtp.c
@@ -34,7 +34,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/reassemble.h>
diff --git a/epan/dissectors/packet-x29.c b/epan/dissectors/packet-x29.c
index f28870af69..5bfca9059d 100644
--- a/epan/dissectors/packet-x29.c
+++ b/epan/dissectors/packet-x29.c
@@ -26,7 +26,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/strutil.h>
diff --git a/epan/dissectors/packet-xdmcp.c b/epan/dissectors/packet-xdmcp.c
index 9c8b8aeb63..34ff6c91c1 100644
--- a/epan/dissectors/packet-xdmcp.c
+++ b/epan/dissectors/packet-xdmcp.c
@@ -30,7 +30,6 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 
diff --git a/epan/dissectors/packet-xot.c b/epan/dissectors/packet-xot.c
index b34af63137..df92715fbd 100644
--- a/epan/dissectors/packet-xot.c
+++ b/epan/dissectors/packet-xot.c
@@ -31,7 +31,6 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-tcp.h"
diff --git a/epan/dissectors/packet-xtp.c b/epan/dissectors/packet-xtp.c
index 4bcec3badb..3dbcc1e1fa 100644
--- a/epan/dissectors/packet-xtp.c
+++ b/epan/dissectors/packet-xtp.c
@@ -30,7 +30,6 @@
 #endif
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-ymsg.c b/epan/dissectors/packet-ymsg.c
index 318eac9f4a..e29585267b 100644
--- a/epan/dissectors/packet-ymsg.c
+++ b/epan/dissectors/packet-ymsg.c
@@ -28,7 +28,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
 
diff --git a/epan/dissectors/packet-zbee-zdp-binding.c b/epan/dissectors/packet-zbee-zdp-binding.c
index 1fe089e4e8..3d63a9cfe7 100644
--- a/epan/dissectors/packet-zbee-zdp-binding.c
+++ b/epan/dissectors/packet-zbee-zdp-binding.c
@@ -29,7 +29,6 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#include <string.h>
 #include <stdlib.h>
 #include <glib.h>
 #include <gmodule.h>
diff --git a/epan/dissectors/packet-zbee-zdp-management.c b/epan/dissectors/packet-zbee-zdp-management.c
index 02da40e1ef..e6dde05be9 100644
--- a/epan/dissectors/packet-zbee-zdp-management.c
+++ b/epan/dissectors/packet-zbee-zdp-management.c
@@ -29,7 +29,6 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#include <string.h>
 #include <stdlib.h>
 #include <glib.h>
 #include <gmodule.h>
diff --git a/epan/dissectors/packet-ziop.c b/epan/dissectors/packet-ziop.c
index ead649ed8e..b38d05caa7 100644
--- a/epan/dissectors/packet-ziop.c
+++ b/epan/dissectors/packet-ziop.c
@@ -33,7 +33,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <errno.h>
 #include <ctype.h>
 #include <glib.h>