--- id3lib-3.8.3.old/configure
+++ id3lib-3.8.3/configure
@@ -10296,7 +10296,6 @@
 
 for ac_header in \
   string                        \
-  iomanip.h                     \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--- id3lib-3.8.3.old/configure.in
+++ id3lib-3.8.3/configure.in
@@ -227,7 +227,6 @@
 )
 AC_CHECK_HEADERS(               \
   string                        \
-  iomanip.h                     \
   ,,AC_MSG_ERROR([Missing a vital header file for id3lib])
 )
 
--- id3lib-3.8.3.old/examples/demo_convert.cpp
+++ id3lib-3.8.3/examples/demo_convert.cpp
@@ -84,7 +84,7 @@
   }
 }
 
-int main( unsigned int argc, char * const argv[])
+int main(int argc, char * const argv[])
 {
   flags_t ulFlag = ID3TT_ALL;
   gengetopt_args_info args;
--- id3lib-3.8.3.old/examples/demo_copy.cpp
+++ id3lib-3.8.3/examples/demo_copy.cpp
@@ -81,7 +81,7 @@
   }
 }
 
-int main( unsigned int argc, char * const argv[])
+int main(int argc, char * const argv[])
 {
   int ulFlag = ID3TT_ID3;
   ID3D_INIT_DOUT();
--- id3lib-3.8.3.old/examples/demo_info.cpp
+++ id3lib-3.8.3/examples/demo_info.cpp
@@ -309,7 +309,7 @@
 
 #define DEBUG
 
-int main( unsigned int argc, char * const argv[])
+int main(int argc, char * const argv[])
 {
   ID3D_INIT_DOUT();
 
--- id3lib-3.8.3.old/examples/demo_tag.cpp
+++ id3lib-3.8.3/examples/demo_tag.cpp
@@ -46,7 +46,7 @@
     os << "v2";
 }
 
-int main( unsigned int argc, char * const argv[])
+int main(int argc, char * const argv[])
 {
   int ulFlag = ID3TT_ID3;
   ID3D_INIT_DOUT();
--- id3lib-3.8.3.old/include/id3/id3lib_strings.h
+++ id3lib-3.8.3/include/id3/id3lib_strings.h
@@ -29,6 +29,7 @@
 #ifndef _ID3LIB_STRINGS_H_
 #define _ID3LIB_STRINGS_H_
 
+#include <cstring>
 #include <string>
 
 #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000))
--- id3lib-3.8.3.old/include/id3/writers.h
+++ id3lib-3.8.3/include/id3/writers.h
@@ -28,9 +28,9 @@
 #ifndef _ID3LIB_WRITERS_H_
 #define _ID3LIB_WRITERS_H_
 
+#include <cstring>
 #include "id3/writer.h"
 #include "id3/id3lib_streams.h"
-//#include <string.h>
 
 class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer
 {