Deleting unnecessary #includes from wsutil.

Will look at cleaning up and committing script afterwards.

Change-Id: Id785e581740ab62fe9258ecfcb0926761ad9c527
Reviewed-on: https://code.wireshark.org/review/6086
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>

23 files changed, 1 insertions, 34 deletions

diff --git a/wsutil/adler32.c b/wsutil/adler32.c
index 24a5ec36d3..c743441d46 100644
--- a/wsutil/adler32.c
+++ b/wsutil/adler32.c
@@ -22,7 +22,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/wsutil/buffer.c b/wsutil/buffer.c
index 43e00c6bd1..5f9daf25f3 100644
--- a/wsutil/buffer.c
+++ b/wsutil/buffer.c
@@ -20,10 +20,8 @@
  */
 #include "config.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <glib.h>
 
 #include "buffer.h"
 
diff --git a/wsutil/clopts_common.c b/wsutil/clopts_common.c
index d3eccff7ba..7adc0ac7f5 100644
--- a/wsutil/clopts_common.c
+++ b/wsutil/clopts_common.c
@@ -22,8 +22,6 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
 
 #include <wsutil/cmdarg_err.h>
diff --git a/wsutil/cmdarg_err.c b/wsutil/cmdarg_err.c
index caa8f82143..6884372c61 100644
--- a/wsutil/cmdarg_err.c
+++ b/wsutil/cmdarg_err.c
@@ -22,7 +22,6 @@
 
 #include "config.h"
 
-#include <stdio.h>
 
 #include <wsutil/cmdarg_err.h>
 
diff --git a/wsutil/cpu_info.c b/wsutil/cpu_info.c
index 5846a581c6..2f556ad681 100644
--- a/wsutil/cpu_info.c
+++ b/wsutil/cpu_info.c
@@ -22,7 +22,6 @@
 
 #include "config.h"
 
-#include <string.h>
 
 #include <glib.h>
 
diff --git a/wsutil/crc11.c b/wsutil/crc11.c
index f39489b501..919bb9eb46 100644
--- a/wsutil/crc11.c
+++ b/wsutil/crc11.c
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <glib.h>
 
 #include <wsutil/crc11.h>
 
diff --git a/wsutil/crc16-plain.c b/wsutil/crc16-plain.c
index 58deebb175..4b3e5aa459 100644
--- a/wsutil/crc16-plain.c
+++ b/wsutil/crc16-plain.c
@@ -40,7 +40,6 @@
  * Modified 2009-03-16 not to include <stdint.h> as our Win32 environment
  * appears not to have it; we're using GLib types, instead.
  *****************************************************************************/
-#include <glib.h>
 #include "wsutil/crc16-plain.h"
 #include <stdlib.h>
 
diff --git a/wsutil/crc16.c b/wsutil/crc16.c
index 6a9339d478..01af42af4b 100644
--- a/wsutil/crc16.c
+++ b/wsutil/crc16.c
@@ -33,7 +33,6 @@
 
 #include <glib.h>
 #include <wsutil/crc16.h>
-#include <wsutil/crc16-plain.h>
 
 
 /*****************************************************************/
diff --git a/wsutil/des.c b/wsutil/des.c
index 8521b31dc7..3db4ec46bf 100644
--- a/wsutil/des.c
+++ b/wsutil/des.c
@@ -22,7 +22,6 @@
 */
 
 #include "config.h"
-#include <glib.h>
 
 #include "des.h"
 
diff --git a/wsutil/glib_version_info.c b/wsutil/glib_version_info.c
index 31c283dd7b..d45ba3d38f 100644
--- a/wsutil/glib_version_info.c
+++ b/wsutil/glib_version_info.c
@@ -22,7 +22,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 
 #include <wsutil/glib_version_info.h>
 
diff --git a/wsutil/md4.c b/wsutil/md4.c
index f4a3d88119..03fddceff7 100644
--- a/wsutil/md4.c
+++ b/wsutil/md4.c
@@ -21,7 +21,6 @@
 #include "config.h"
 
 #include <glib.h>
-#include <string.h>
 
 #include "md4.h"
 
diff --git a/wsutil/md5.c b/wsutil/md5.c
index 6f0a1a75d0..14ad197eca 100644
--- a/wsutil/md5.c
+++ b/wsutil/md5.c
@@ -27,8 +27,6 @@
 
 #include "config.h"
 
-#include <glib.h>
-#include <string.h>
 
 #include "pint.h"
 #include "md5.h"
diff --git a/wsutil/os_version_info.c b/wsutil/os_version_info.c
index 5c79de3250..3553beb09a 100644
--- a/wsutil/os_version_info.c
+++ b/wsutil/os_version_info.c
@@ -22,7 +22,6 @@
 
 #include "config.h"
 
-#include <string.h>
 #include <errno.h>
 
 #ifdef HAVE_SYS_UTSNAME_H
diff --git a/wsutil/rc4.c b/wsutil/rc4.c
index 821b9b298f..5d10bf064d 100644
--- a/wsutil/rc4.c
+++ b/wsutil/rc4.c
@@ -23,8 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
-#include <string.h>
 
 #include "rc4.h"
 
diff --git a/wsutil/report_err.c b/wsutil/report_err.c
index e14aceda2e..6b9fd13ae7 100644
--- a/wsutil/report_err.c
+++ b/wsutil/report_err.c
@@ -30,7 +30,6 @@
 #include "config.h"
 
 #include <glib.h>
-#include <stdarg.h>
 #include "report_err.h"
 
 static void (*report_failure_func)(const char *, va_list);
diff --git a/wsutil/sha1.c b/wsutil/sha1.c
index 55a9964831..bdad7f24cd 100644
--- a/wsutil/sha1.c
+++ b/wsutil/sha1.c
@@ -25,11 +25,9 @@
  *  2012-08-21 - C Elston - Split sha1_hmac function to allow incremental usage.
  */
 
-#include <string.h>
 #include <glib.h>
 
 #include "sha1.h"
-#include "file_util.h"
 
 #define GET_UINT32(n,b,i)                       \
 {                                               \
diff --git a/wsutil/sober128.c b/wsutil/sober128.c
index 5534cef3e2..bc46903fd0 100644
--- a/wsutil/sober128.c
+++ b/wsutil/sober128.c
@@ -21,7 +21,6 @@
  */
 
 #include "sober128.h"
-#include <string.h>             /* for memcpy */
 
 #define CONST64(n) n ## ULL
 
diff --git a/wsutil/str_util.c b/wsutil/str_util.c
index c08d96d02f..04a30d4723 100644
--- a/wsutil/str_util.c
+++ b/wsutil/str_util.c
@@ -22,7 +22,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include "str_util.h"
 
 int
diff --git a/wsutil/strnatcmp.c b/wsutil/strnatcmp.c
index 8c8347378c..0c971e73fd 100644
--- a/wsutil/strnatcmp.c
+++ b/wsutil/strnatcmp.c
@@ -38,8 +38,6 @@
  * ws_ascii_XXX() to reflect this.
  */
 
-#include <string.h>
-#include <stdio.h>
 
 #include <glib.h>
 
diff --git a/wsutil/strptime.c b/wsutil/strptime.c
index d69a0199f3..c711d7ebdb 100644
--- a/wsutil/strptime.c
+++ b/wsutil/strptime.c
@@ -27,9 +27,7 @@
 #include "config.h"
 
 #include <ctype.h>
-#include <limits.h>
-#include <string.h>
-#include <time.h>
+#include <string.h>		
 #include <glib.h>
 
 #ifdef _LIBC
diff --git a/wsutil/tempfile.c b/wsutil/tempfile.c
index dab286752f..bbb60bca4c 100644
--- a/wsutil/tempfile.c
+++ b/wsutil/tempfile.c
@@ -22,12 +22,8 @@
 
 #include "config.h"
 
-#include <glib.h>
 
-#include <time.h>
 #include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
 #include <errno.h>
 
 #ifdef HAVE_FCNTL_H
diff --git a/wsutil/type_util.c b/wsutil/type_util.c
index 42f83eec15..d41ab7d10a 100644
--- a/wsutil/type_util.c
+++ b/wsutil/type_util.c
@@ -22,7 +22,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include "type_util.h"
 
 /*
diff --git a/wsutil/ws_version_info.c b/wsutil/ws_version_info.c
index 4fb68dd2bc..49af7acfad 100644
--- a/wsutil/ws_version_info.c
+++ b/wsutil/ws_version_info.c
@@ -26,7 +26,6 @@
 
 #include <glib.h>
 
-#include "version.h"
 
 #include <wsutil/ws_version_info.h>
 #include <wsutil/copyright_info.h>