27 files changed, 230 insertions, 218 deletions

diff --git a/configure.ac b/configure.ac
index 78a8fe8..04f0cde 100644
--- a/configure.ac
+++ b/configure.ac
@@ -527,6 +527,7 @@ contrib/macosx/Info.plist
 doc/Makefile
 src/Makefile
 src/include/Makefile
+src/common/Makefile
 src/main/Makefile
 src/plugins/Makefile
 src/plugins/ole2/Makefile
diff --git a/doc/extractor.texi b/doc/extractor.texi
index f13ba68..fad0fdb 100644
--- a/doc/extractor.texi
+++ b/doc/extractor.texi
@@ -648,10 +648,10 @@ file format has been established (beyond reasonable doubt).
 
 @cindex UTF-8
 @cindex character set
-@findex convertToUtf8
+@findex EXTRACTOR_common_convert_to_utf8
 Various @acronym{libextractor} plugins make use of the internal
 @file{convert.h} header which defines a function
-@verb{|convertToUtf8|} which can be used to easily convert text from
+@verb{|EXTRACTOR_common_convert_to_utf8|} which can be used to easily convert text from
 any character set to UTF-8.  This conversion is important since the
 linked list of keywords that is returned by @acronym{libextractor} is
 expected to contain only UTF-8 strings.  Naturally, proper conversion
@@ -659,12 +659,12 @@ may not always be possible since some file formats fail to specify the
 character set.  In that case, it is often better to not convert at
 all.
 
-The arguments to @verb{|convertToUtf8|} are the input string (which
+The arguments to @verb{|EXTRACTOR_common_convert_to_utf8|} are the input string (which
 does @emph{not} have to be zero-terminated), the length of the input
 string, and the character set (which @emph{must} be zero-terminated).
 Which character sets are supported depends on the platform, a list can
 generally be obtained using the @command{iconv -l} command.  The
-return value from @verb{|convertToUtf8|} is a zero-terminated string
+return value from @verb{|EXTRACTOR_common_convert_to_utf8|} is a zero-terminated string
 in UTF-8 format.  The responsibility to free the string is with the
 caller, so storing the string in the keyword list is acceptable.
 
diff --git a/src/Makefile.am b/src/Makefile.am
index fbf1ff0..281d2d8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,3 @@
 INCLUDES = -I$(top_srcdir)/src/include
 
-SUBDIRS = include main plugins test .
+SUBDIRS = include main common plugins test .
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
new file mode 100644
index 0000000..4ffd5bd
--- /dev/null
+++ b/src/common/Makefile.am
@@ -0,0 +1,30 @@
+INCLUDES = -I$(top_srcdir)/src/include $(LTDLINCL)
+
+LIBS = \
+ @LTLIBINTL@ @LIBS@
+
+lib_LTLIBRARIES = \
+  libextractor_common.la
+
+if !MINGW
+  exportflag=-export-symbols-regex "EXTRACTOR_.*"
+if !SOMEBSD
+    dlflag=-ldl
+endif
+else
+  winexportflag=-export-dynamic
+endif
+
+libextractor_common_la_LDFLAGS = \
+  $(exportflag) $(winexportflag) -version-info @LIB_VERSION_CURRENT@:@LIB_VERSION_REVISION@:@LIB_VERSION_AGE@ $(LIBICONV)
+
+libextractor_common_la_LIBADD = \
+  $(LIBLTDL) $(dlflag)
+
+libextractor_common_la_SOURCES = \
+  pack.c \
+  pack.h \
+  convert.c \
+  convert.h \
+  convert_numeric.c \
+  convert_numeric.h
diff --git a/src/plugins/convert.c b/src/common/convert.c
index b416fa8..fc04db0 100644
--- a/src/plugins/convert.c
+++ b/src/common/convert.c
@@ -31,7 +31,7 @@
  *  string is returned.
  */
 char *
-convertToUtf8 (const char *input, size_t len, const char *charset)
+EXTRACTOR_common_convert_to_utf8 (const char *input, size_t len, const char *charset)
 {
   size_t tmpSize;
   size_t finSize;
diff --git a/src/plugins/convert.h b/src/common/convert.h
index 3bb4c06..72e02a5 100644
--- a/src/plugins/convert.h
+++ b/src/common/convert.h
@@ -35,7 +35,7 @@ extern "C" {
  * to UTF-8.
  * @return the converted string (0-terminated)
  */
-char * convertToUtf8(const char * input,
+char * EXTRACTOR_common_convert_to_utf8(const char * input,
                      size_t len,
                      const char * charset);
 
diff --git a/src/plugins/convert_numeric.c b/src/common/convert_numeric.c
index e41151a..9c86b6f 100644
--- a/src/plugins/convert_numeric.c
+++ b/src/common/convert_numeric.c
@@ -57,15 +57,15 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 #endif
 
 static unsigned long get_field (const unsigned char *,
-                                enum floatformat_byteorders,
+                                enum EXTRACTOR_floatformat_byteorders,
                                 unsigned int,
                                 unsigned int,
                                 unsigned int);
-static int floatformat_always_valid (const struct floatformat *fmt,
+static int floatformat_always_valid (const struct EXTRACTOR_floatformat *fmt,
                                      const void *from);
 
 static int
-floatformat_always_valid (const struct floatformat *fmt /*ATTRIBUTE_UNUSED*/,
+floatformat_always_valid (const struct EXTRACTOR_floatformat *fmt /*ATTRIBUTE_UNUSED*/,
                           const void *from /*ATTRIBUTE_UNUSED*/)
 {
   return 1;
@@ -77,28 +77,28 @@ floatformat_always_valid (const struct floatformat *fmt /*ATTRIBUTE_UNUSED*/,
 #define FLOATFORMAT_CHAR_BIT 8
 
 /* floatformats for IEEE single and double, big and little endian.  */
-const struct floatformat floatformat_ieee_single_big =
+const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_ieee_single_big =
 {
   floatformat_big, 32, 0, 1, 8, 127, 255, 9, 23,
   floatformat_intbit_no,
   "floatformat_ieee_single_big",
   floatformat_always_valid
 };
-const struct floatformat floatformat_ieee_single_little =
+const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_ieee_single_little =
 {
   floatformat_little, 32, 0, 1, 8, 127, 255, 9, 23,
   floatformat_intbit_no,
   "floatformat_ieee_single_little",
   floatformat_always_valid
 };
-const struct floatformat floatformat_ieee_double_big =
+const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_ieee_double_big =
 {
   floatformat_big, 64, 0, 1, 11, 1023, 2047, 12, 52,
   floatformat_intbit_no,
   "floatformat_ieee_double_big",
   floatformat_always_valid
 };
-const struct floatformat floatformat_ieee_double_little =
+const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_ieee_double_little =
 {
   floatformat_little, 64, 0, 1, 11, 1023, 2047, 12, 52,
   floatformat_intbit_no,
@@ -109,7 +109,7 @@ const struct floatformat floatformat_ieee_double_little =
 /* floatformat for IEEE double, little endian byte order, with big endian word
    ordering, as on the ARM.  */
 
-const struct floatformat floatformat_ieee_double_littlebyte_bigword =
+const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_ieee_double_littlebyte_bigword =
 {
   floatformat_littlebyte_bigword, 64, 0, 1, 11, 1023, 2047, 12, 52,
   floatformat_intbit_no,
@@ -119,21 +119,21 @@ const struct floatformat floatformat_ieee_double_littlebyte_bigword =
 
 /* floatformat for VAX.  Not quite IEEE, but close enough.  */
 
-const struct floatformat floatformat_vax_f =
+const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_vax_f =
 {
   floatformat_vax, 32, 0, 1, 8, 129, 0, 9, 23,
   floatformat_intbit_no,
   "floatformat_vax_f",
   floatformat_always_valid
 };
-const struct floatformat floatformat_vax_d =
+const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_vax_d =
 {
   floatformat_vax, 64, 0, 1, 8, 129, 0, 9, 55,
   floatformat_intbit_no,
   "floatformat_vax_d",
   floatformat_always_valid
 };
-const struct floatformat floatformat_vax_g =
+const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_vax_g =
 {
   floatformat_vax, 64, 0, 1, 11, 1025, 0, 12, 52,
   floatformat_intbit_no,
@@ -141,11 +141,11 @@ const struct floatformat floatformat_vax_g =
   floatformat_always_valid
 };
 
-static int floatformat_i387_ext_is_valid (const struct floatformat *fmt,
+static int floatformat_i387_ext_is_valid (const struct EXTRACTOR_floatformat *fmt,
                                           const void *from);
 
 static int
-floatformat_i387_ext_is_valid (const struct floatformat *fmt, const void *from)
+floatformat_i387_ext_is_valid (const struct EXTRACTOR_floatformat *fmt, const void *from)
 {
   /* In the i387 double-extended format, if the exponent is all ones,
      then the integer bit must be set.  If the exponent is neither 0
@@ -165,14 +165,14 @@ floatformat_i387_ext_is_valid (const struct floatformat *fmt, const void *from)
     return 1;
 }
 
-const struct floatformat floatformat_i387_ext =
+const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_i387_ext =
 {
   floatformat_little, 80, 0, 1, 15, 0x3fff, 0x7fff, 16, 64,
   floatformat_intbit_yes,
   "floatformat_i387_ext",
   floatformat_i387_ext_is_valid
 };
-const struct floatformat floatformat_m68881_ext =
+const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_m68881_ext =
 {
   /* Note that the bits from 16 to 31 are unused.  */
   floatformat_big, 96, 0, 1, 15, 0x3fff, 0x7fff, 32, 64,
@@ -180,7 +180,7 @@ const struct floatformat floatformat_m68881_ext =
   "floatformat_m68881_ext",
   floatformat_always_valid
 };
-const struct floatformat floatformat_i960_ext =
+const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_i960_ext =
 {
   /* Note that the bits from 0 to 15 are unused.  */
   floatformat_little, 96, 16, 17, 15, 0x3fff, 0x7fff, 32, 64,
@@ -188,14 +188,14 @@ const struct floatformat floatformat_i960_ext =
   "floatformat_i960_ext",
   floatformat_always_valid
 };
-const struct floatformat floatformat_m88110_ext =
+const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_m88110_ext =
 {
   floatformat_big, 80, 0, 1, 15, 0x3fff, 0x7fff, 16, 64,
   floatformat_intbit_yes,
   "floatformat_m88110_ext",
   floatformat_always_valid
 };
-const struct floatformat floatformat_m88110_harris_ext =
+const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_m88110_harris_ext =
 {
   /* Harris uses raw format 128 bytes long, but the number is just an ieee
      double, and the last 64 bits are wasted. */
@@ -204,7 +204,7 @@ const struct floatformat floatformat_m88110_harris_ext =
   "floatformat_m88110_ext_harris",
   floatformat_always_valid
 };
-const struct floatformat floatformat_arm_ext_big =
+const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_arm_ext_big =
 {
   /* Bits 1 to 16 are unused.  */
   floatformat_big, 96, 0, 17, 15, 0x3fff, 0x7fff, 32, 64,
@@ -212,7 +212,7 @@ const struct floatformat floatformat_arm_ext_big =
   "floatformat_arm_ext_big",
   floatformat_always_valid
 };
-const struct floatformat floatformat_arm_ext_littlebyte_bigword =
+const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_arm_ext_littlebyte_bigword =
 {
   /* Bits 1 to 16 are unused.  */
   floatformat_littlebyte_bigword, 96, 0, 17, 15, 0x3fff, 0x7fff, 32, 64,
@@ -220,35 +220,35 @@ const struct floatformat floatformat_arm_ext_littlebyte_bigword =
   "floatformat_arm_ext_littlebyte_bigword",
   floatformat_always_valid
 };
-const struct floatformat floatformat_ia64_spill_big =
+const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_ia64_spill_big =
 {
   floatformat_big, 128, 0, 1, 17, 65535, 0x1ffff, 18, 64,
   floatformat_intbit_yes,
   "floatformat_ia64_spill_big",
   floatformat_always_valid
 };
-const struct floatformat floatformat_ia64_spill_little =
+const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_ia64_spill_little =
 {
   floatformat_little, 128, 0, 1, 17, 65535, 0x1ffff, 18, 64,
   floatformat_intbit_yes,
   "floatformat_ia64_spill_little",
   floatformat_always_valid
 };
-const struct floatformat floatformat_ia64_quad_big =
+const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_ia64_quad_big =
 {
   floatformat_big, 128, 0, 1, 15, 16383, 0x7fff, 16, 112,
   floatformat_intbit_no,
   "floatformat_ia64_quad_big",
   floatformat_always_valid
 };
-const struct floatformat floatformat_ia64_quad_little =
+const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_ia64_quad_little =
 {
   floatformat_little, 128, 0, 1, 15, 16383, 0x7fff, 16, 112,
   floatformat_intbit_no,
   "floatformat_ia64_quad_little",
   floatformat_always_valid
 };
-
+
 
 #ifndef min
 #define min(a, b) ((a) < (b) ? (a) : (b))
@@ -257,7 +257,7 @@ const struct floatformat floatformat_ia64_quad_little =
 /* Extract a field which starts at START and is LEN bits long.  DATA and
    TOTAL_LEN are the thing we are extracting it from, in byteorder ORDER.  */
 static unsigned long
-get_field (const unsigned char *data, enum floatformat_byteorders order,
+get_field (const unsigned char *data, enum EXTRACTOR_floatformat_byteorders order,
            unsigned int total_len, unsigned int start, unsigned int len)
 {
   unsigned long result = 0;
@@ -276,7 +276,7 @@ get_field (const unsigned char *data, enum floatformat_byteorders order,
 
   lo_bit = start % FLOATFORMAT_CHAR_BIT;
   hi_bit = min (lo_bit + len, FLOATFORMAT_CHAR_BIT);
-  
+
   do
     {
       unsigned int shifted = *(data + cur_byte) >> lo_bit;
@@ -293,13 +293,13 @@ get_field (const unsigned char *data, enum floatformat_byteorders order,
 
   return result;
 }
-  
+
 /* Convert from FMT to a double.
    FROM is the address of the extended float.
    Store the double in *TO.  */
 
 void
-floatformat_to_double (const struct floatformat *fmt,
+EXTRACTOR_common_floatformat_to_double (const struct EXTRACTOR_floatformat *fmt,
                        const void *from, double *to)
 {
   const unsigned char *ufrom = (const unsigned char *) from;
@@ -411,8 +411,8 @@ floatformat_to_double (const struct floatformat *fmt,
     dto = -dto;
   *to = dto;
 }
-
-static void put_field (unsigned char *, enum floatformat_byteorders,
+
+static void put_field (unsigned char *, enum EXTRACTOR_floatformat_byteorders,
                        unsigned int,
                        unsigned int,
                        unsigned int,
@@ -421,7 +421,7 @@ static void put_field (unsigned char *, enum floatformat_byteorders,
 /* Set a field which starts at START and is LEN bits long.  DATA and
    TOTAL_LEN are the thing we are extracting it from, in byteorder ORDER.  */
 static void
-put_field (unsigned char *data, enum floatformat_byteorders order,
+put_field (unsigned char *data, enum EXTRACTOR_floatformat_byteorders order,
            unsigned int total_len, unsigned int start, unsigned int len,
            unsigned long stuff_to_put)
 {
@@ -440,7 +440,7 @@ put_field (unsigned char *data, enum floatformat_byteorders order,
 
   lo_bit = start % FLOATFORMAT_CHAR_BIT;
   hi_bit = min (lo_bit + len, FLOATFORMAT_CHAR_BIT);
-  
+
   do
     {
       unsigned char *byte_ptr = data + cur_byte;
@@ -461,7 +461,7 @@ put_field (unsigned char *data, enum floatformat_byteorders order,
    restrictions.  */
 
 void
-floatformat_from_double (const struct floatformat *fmt,
+EXTRACTOR_common_floatformat_from_double (const struct EXTRACTOR_floatformat *fmt,
                          const double *from, void *to)
 {
   double dfrom;
@@ -557,7 +557,7 @@ floatformat_from_double (const struct floatformat *fmt,
 /* Return non-zero iff the data at FROM is a valid number in format FMT.  */
 
 int
-floatformat_is_valid (const struct floatformat *fmt, const void *from)
+EXTRACTOR_common_floatformat_is_valid (const struct EXTRACTOR_floatformat *fmt, const void *from)
 {
   return fmt->is_valid (fmt, from);
 }
diff --git a/src/plugins/convert_numeric.h b/src/common/convert_numeric.h
index 6889fca..cc425f5 100644
--- a/src/plugins/convert_numeric.h
+++ b/src/common/convert_numeric.h
@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 
 /* What is the order of the bytes?  */
 
-enum floatformat_byteorders {
+enum EXTRACTOR_floatformat_byteorders {
   /* Standard little endian byte order.
      EX: 1.2345678e10 => 00 00 80 c5 e0 fe 06 42 */
   floatformat_little,
@@ -51,11 +51,11 @@ enum floatformat_byteorders {
   floatformat_vax
 };
 
-enum floatformat_intbit { floatformat_intbit_yes, floatformat_intbit_no };
+enum EXTRACTOR_floatformat_intbit { floatformat_intbit_yes, floatformat_intbit_no };
 
-struct floatformat
+struct EXTRACTOR_floatformat
 {
-  enum floatformat_byteorders byteorder;
+  enum EXTRACTOR_floatformat_byteorders byteorder;
   unsigned int totalsize;       /* Total size of number in bits */
 
   /* Sign bit is always one bit long.  1 means negative, 0 means positive.  */
@@ -78,63 +78,63 @@ struct floatformat
   unsigned int man_len;
 
   /* Is the integer bit explicit or implicit?  */
-  enum floatformat_intbit intbit;
+  enum EXTRACTOR_floatformat_intbit intbit;
 
   /* Internal name for debugging. */
   const char *name;
 
   /* Validator method.  */
-  int (*is_valid) (const struct floatformat *fmt, const void *from);
+  int (*is_valid) (const struct EXTRACTOR_floatformat *fmt, const void *from);
 };
 
 /* floatformats for IEEE single and double, big and little endian.  */
 
-extern const struct floatformat floatformat_ieee_single_big;
-extern const struct floatformat floatformat_ieee_single_little;
-extern const struct floatformat floatformat_ieee_double_big;
-extern const struct floatformat floatformat_ieee_double_little;
+extern const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_ieee_single_big;
+extern const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_ieee_single_little;
+extern const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_ieee_double_big;
+extern const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_ieee_double_little;
 
 /* floatformat for ARM IEEE double, little endian bytes and big endian words */
 
-extern const struct floatformat floatformat_ieee_double_littlebyte_bigword;
+extern const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_ieee_double_littlebyte_bigword;
 
 /* floatformats for VAX.  */
 
-extern const struct floatformat floatformat_vax_f;
-extern const struct floatformat floatformat_vax_d;
-extern const struct floatformat floatformat_vax_g;
+extern const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_vax_f;
+extern const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_vax_d;
+extern const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_vax_g;
 
 /* floatformats for various extendeds.  */
 
-extern const struct floatformat floatformat_i387_ext;
-extern const struct floatformat floatformat_m68881_ext;
-extern const struct floatformat floatformat_i960_ext;
-extern const struct floatformat floatformat_m88110_ext;
-extern const struct floatformat floatformat_m88110_harris_ext;
-extern const struct floatformat floatformat_arm_ext_big;
-extern const struct floatformat floatformat_arm_ext_littlebyte_bigword;
+extern const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_i387_ext;
+extern const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_m68881_ext;
+extern const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_i960_ext;
+extern const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_m88110_ext;
+extern const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_m88110_harris_ext;
+extern const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_arm_ext_big;
+extern const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_arm_ext_littlebyte_bigword;
 /* IA-64 Floating Point register spilt into memory.  */
-extern const struct floatformat floatformat_ia64_spill_big;
-extern const struct floatformat floatformat_ia64_spill_little;
-extern const struct floatformat floatformat_ia64_quad_big;
-extern const struct floatformat floatformat_ia64_quad_little;
+extern const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_ia64_spill_big;
+extern const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_ia64_spill_little;
+extern const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_ia64_quad_big;
+extern const struct EXTRACTOR_floatformat EXTRACTOR_floatformat_ia64_quad_little;
 
 /* Convert from FMT to a double.
    FROM is the address of the extended float.
    Store the double in *TO.  */
 
 extern void
-floatformat_to_double (const struct floatformat *, const void *, double *);
+EXTRACTOR_common_floatformat_to_double (const struct EXTRACTOR_floatformat *, const void *, double *);
 
 /* The converse: convert the double *FROM to FMT
    and store where TO points.  */
 
 extern void
-floatformat_from_double (const struct floatformat *, const double *, void *);
+EXTRACTOR_common_floatformat_from_double (const struct EXTRACTOR_floatformat *, const double *, void *);
 
 /* Return non-zero iff the data at FROM is a valid number in format FMT.  */
 
 extern int
-floatformat_is_valid (const struct floatformat *fmt, const void *from);
+EXTRACTOR_common_floatformat_is_valid (const struct EXTRACTOR_floatformat *fmt, const void *from);
 
 #endif  /* defined (FLOATFORMAT_H) */
diff --git a/src/plugins/pack.c b/src/common/pack.c
index 8b3c3f5..ee0d2ba 100644
--- a/src/plugins/pack.c
+++ b/src/common/pack.c
@@ -56,7 +56,7 @@ typedef signed int sword;
  */
 
 int
-cat_pack (void *buf, const char *fmt, ...)
+EXTRACTOR_common_cat_pack (void *buf, const char *fmt, ...)
 {
   va_list ap;
   word blen, val;
@@ -248,7 +248,7 @@ cat_pack (void *buf, const char *fmt, ...)
 
 
 int
-cat_unpack (const void *buf, const char *fmt, ...)
+EXTRACTOR_common_cat_unpack (const void *buf, const char *fmt, ...)
 {
   va_list ap;
   word maxlen, len, *wordp;
diff --git a/src/plugins/pack.h b/src/common/pack.h
index 81824f2..3b2c2c5 100644
--- a/src/plugins/pack.h
+++ b/src/common/pack.h
@@ -45,9 +45,9 @@ MODIFICATIONS.
        to hold the data.
  */
 
-int cat_pack(void * buf, const char *fmt, ... );
+int EXTRACTOR_common_cat_pack(void * buf, const char *fmt, ... );
 
-int cat_unpack(const void * buf, const char *fmt, ... );
+int EXTRACTOR_common_cat_unpack(const void * buf, const char *fmt, ... );
 
 struct cat_bvec {
   unsigned long len;
diff --git a/src/plugins/Makefile-plugins.am b/src/plugins/Makefile-plugins.am
index af0a425..9392798 100644
--- a/src/plugins/Makefile-plugins.am
+++ b/src/plugins/Makefile-plugins.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+INCLUDES = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/common
 
 # install plugins under:
 plugindir = $(libdir)/@RPLUGINDIR@
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index e0d47ec..dd884a8 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -142,11 +142,6 @@ libextractor_flac_la_LDFLAGS = \
  -lFLAC $(flacoggflag) $(PLUGINFLAGS)  $(retaincommand)
 endif
 
-noinst_LTLIBRARIES = \
-  libpack.la \
-  libconvert.la \
-  libconvert_numeric.la
-
 if HAVE_ZLIB
 libextractor_qt_la_LDFLAGS = \
   $(PLUGINFLAGS)  $(retaincommand)
@@ -172,35 +167,35 @@ libextractor_pdf_la_SOURCES = \
 libextractor_pdf_la_LDFLAGS = \
   $(PLUGINFLAGS)  $(retaincommand)
 libextractor_pdf_la_LIBADD = \
-  libconvert.la  
+  $(top_builddir)/src/common/libextractor_common.la
 
 libextractor_mp3_la_SOURCES = \
   mp3extractor.c 
 libextractor_mp3_la_LDFLAGS = \
   $(PLUGINFLAGS) $(retaincommand)
 libextractor_mp3_la_LIBADD = \
-  libconvert.la  
+  $(top_builddir)/src/common/libextractor_common.la
 
 libextractor_id3v2_la_SOURCES = \
   id3v2extractor.c 
 libextractor_id3v2_la_LDFLAGS = \
   $(PLUGINFLAGS)  $(retaincommand)
 libextractor_id3v2_la_LIBADD = \
-  libconvert.la
+  $(top_builddir)/src/common/libextractor_common.la
 
 libextractor_id3v23_la_SOURCES = \
   id3v23extractor.c 
 libextractor_id3v23_la_LDFLAGS = \
   $(PLUGINFLAGS)  $(retaincommand)
 libextractor_id3v23_la_LIBADD = \
-  libconvert.la 
+  $(top_builddir)/src/common/libextractor_common.la
 
 libextractor_id3v24_la_SOURCES = \
   id3v24extractor.c 
 libextractor_id3v24_la_LDFLAGS = \
   $(PLUGINFLAGS)  $(retaincommand)
 libextractor_id3v24_la_LIBADD = \
-  libconvert.la
+  $(top_builddir)/src/common/libextractor_common.la
 
 libextractor_it_la_SOURCES = \
   itextractor.c 
@@ -238,42 +233,28 @@ libextractor_gif_la_SOURCES = \
 libextractor_gif_la_LDFLAGS = \
   $(PLUGINFLAGS)  $(retaincommand)
 libextractor_gif_la_LIBADD = \
-  libpack.la
+  $(top_builddir)/src/common/libextractor_common.la
 
 libextractor_tiff_la_SOURCES = \
   tiffextractor.c 
 libextractor_tiff_la_LDFLAGS = \
   $(PLUGINFLAGS)  $(retaincommand)
 libextractor_tiff_la_LIBADD = \
-  libpack.la
+  $(top_builddir)/src/common/libextractor_common.la
 
 libextractor_applefile_la_SOURCES = \
   applefileextractor.c
 libextractor_applefile_la_LDFLAGS = \
   $(PLUGINFLAGS)  $(retaincommand)
 libextractor_applefile_la_LIBADD = \
-  libpack.la
+  $(top_builddir)/src/common/libextractor_common.la
 
 libextractor_elf_la_SOURCES = \
   elfextractor.c 
 libextractor_elf_la_LDFLAGS = \
   $(PLUGINFLAGS)  $(retaincommand)
 libextractor_elf_la_LIBADD = \
-  libpack.la
-
-libpack_la_SOURCES = \
-  pack.c \
-  pack.h 
-
-libconvert_la_SOURCES = \
-  convert.c \
-  convert.h 
-libconvert_la_LDFLAGS = \
-  $(LIBICONV)
-
-libconvert_numeric_la_SOURCES = \
-  convert_numeric.c \
-  convert_numeric.h 
+  $(top_builddir)/src/common/libextractor_common.la
 
 libextractor_zip_la_SOURCES = \
   zipextractor.c
@@ -292,14 +273,14 @@ libextractor_html_la_LDFLAGS = \
   $(PLUGINFLAGS)   $(retaincommand)
 libextractor_html_la_LIBADD = \
   $(top_builddir)/src/main/libextractor.la \
-  libconvert.la 
+  $(top_builddir)/src/common/libextractor_common.la
 
 libextractor_flv_la_SOURCES = \
   flvextractor.c
 libextractor_flv_la_LDFLAGS = \
   $(PLUGINFLAGS)  $(retaincommand)
 libextractor_flv_la_LIBADD = \
-  libconvert_numeric.la
+  $(top_builddir)/src/common/libextractor_common.la
 
 libextractor_real_la_SOURCES = \
   realextractor.c 
@@ -353,7 +334,7 @@ libextractor_png_la_LDFLAGS = \
   $(top_builddir)/src/main/libextractor.la \
   $(PLUGINFLAGS) $(retaincommand)
 libextractor_png_la_LIBADD = \
-  libconvert.la -lz
+  $(top_builddir)/src/common/libextractor_common.la -lz
 endif
 
 libextractor_filename_la_SOURCES = \
@@ -362,7 +343,7 @@ libextractor_filename_la_LDFLAGS = \
   $(PLUGINFLAGS)  $(retaincommand)
 libextractor_filename_la_LIBADD = \
   $(top_builddir)/src/main/libextractor.la \
-  libconvert.la
+  $(top_builddir)/src/common/libextractor_common.la
 
 libextractor_sid_la_SOURCES = \
   sidextractor.c 
diff --git a/src/plugins/applefileextractor.c b/src/plugins/applefileextractor.c
index 995b5c1..33685ab 100644
--- a/src/plugins/applefileextractor.c
+++ b/src/plugins/applefileextractor.c
@@ -99,7 +99,7 @@ static int readApplefileHeader(const unsigned char *data,
   if ((*offset + APPLEFILE_HEADER_SIZE) > size)
     return -1;
 
-  cat_unpack(data + *offset,
+  EXTRACTOR_common_cat_unpack(data + *offset,
              APPLEFILE_HEADER_SPEC,
              APPLEFILE_HEADER_FIELDS(hdr));
   *offset += APPLEFILE_HEADER_SIZE;
@@ -114,8 +114,8 @@ static int readEntryDescriptor(const unsigned char *data,
   if ((*offset + APPLEFILE_ENTRY_DESCRIPTOR_SIZE) > size)
     return -1;
 
-  cat_unpack(data + *offset,
-             APPLEFILE_ENTRY_DESCRIPTOR_SPEC, 
+  EXTRACTOR_common_cat_unpack(data + *offset,
+             APPLEFILE_ENTRY_DESCRIPTOR_SPEC,
              APPLEFILE_ENTRY_DESCRIPTOR_FIELDS(dsc));
   *offset += APPLEFILE_ENTRY_DESCRIPTOR_SIZE;
   return 0;
@@ -137,7 +137,7 @@ libextractor_applefile_extract (const char *filename,
   if (readApplefileHeader(data, &offset, size, &header) == -1)
     return prev;
 
-  if ((memcmp(header.magic, APPLESINGLE_SIGNATURE, 4) != 0) && 
+  if ((memcmp(header.magic, APPLESINGLE_SIGNATURE, 4) != 0) &&
         (memcmp(header.magic, APPLEDOUBLE_SIGNATURE, 4) != 0))
       return prev;
 
@@ -175,7 +175,7 @@ libextractor_applefile_extract (const char *filename,
         else
           snprintf (s, 13, "%.2f %s", (double) dsc.length, _("Bytes"));
 
-        result = addKeyword(EXTRACTOR_FILE_SIZE, s, result); 
+        result = addKeyword(EXTRACTOR_FILE_SIZE, s, result);
         }
         break;
       case AED_ID_REAL_NAME:
diff --git a/src/plugins/elfextractor.c b/src/plugins/elfextractor.c
index 535c435..d750de3 100644
--- a/src/plugins/elfextractor.c
+++ b/src/plugins/elfextractor.c
@@ -294,7 +294,7 @@ getSectionHdr (char *data,
   if (ehdr->e_shnum <= idx)
     return -1;
 
-  cat_unpack (&data[ehdr->e_shoff + ehdr->e_shentsize * idx],
+  EXTRACTOR_common_cat_unpack (&data[ehdr->e_shoff + ehdr->e_shentsize * idx],
               ELF_SECTION_SPECS[getByteorder (data[EI_CLASS])],
               ELF_SECTION_FIELDS (ret));
   return 0;
@@ -312,7 +312,7 @@ getDynTag (char *data,
 {
   if ((off + osize > size) || ((idx + 1) * ELF_DYN_SIZE > osize))
     return -1;
-  cat_unpack (&data[off + idx * ELF_DYN_SIZE],
+  EXTRACTOR_common_cat_unpack (&data[off + idx * ELF_DYN_SIZE],
               ELF_DYN_SPECS[getByteorder (data[EI_CLASS])],
               ELF_DYN_FIELDS (ret));
   return 0;
@@ -330,7 +330,7 @@ getProgramHdr (char *data,
   if (ehdr->e_phnum <= idx)
     return -1;
 
-  cat_unpack (&data[ehdr->e_phoff + ehdr->e_phensize * idx],
+  EXTRACTOR_common_cat_unpack (&data[ehdr->e_phoff + ehdr->e_phensize * idx],
               ELF_PHDR_SPECS[getByteorder (data[EI_CLASS])],
               ELF_PHDR_FIELDS (ret));
   return 0;
@@ -353,7 +353,7 @@ getELFHdr (char *data, size_t size, Elf32_Ehdr * ehdr)
     {
     case ELFDATA2LSB:
     case ELFDATA2MSB:
-      cat_unpack (&data[EI_NIDENT],
+      EXTRACTOR_common_cat_unpack (&data[EI_NIDENT],
                   ELF_HEADER_SPECS[getByteorder (data[EI_CLASS])],
                   ELF_HEADER_FIELDS (ehdr));
       break;
diff --git a/src/plugins/filenameextractor.c b/src/plugins/filenameextractor.c
index ce3ad78..500f9b8 100644
--- a/src/plugins/filenameextractor.c
+++ b/src/plugins/filenameextractor.c
@@ -44,7 +44,7 @@ libextractor_filename_extract (const char *filename,
           }
       keyword = malloc (sizeof (EXTRACTOR_KeywordList));
       keyword->next = prev;
-      keyword->keyword = convertToUtf8 (filenameRoot,
+      keyword->keyword = EXTRACTOR_common_convert_to_utf8 (filenameRoot,
                                         strlen (filenameRoot),
                                         nl_langinfo (CODESET));
       keyword->keywordType = EXTRACTOR_FILENAME;
diff --git a/src/plugins/flvextractor.c b/src/plugins/flvextractor.c
index 60f7979..c22cce5 100644
--- a/src/plugins/flvextractor.c
+++ b/src/plugins/flvextractor.c
@@ -117,8 +117,8 @@ static inline double readDouble(const unsigned char **data)
   const unsigned char *ptr = *data;
   double val;
 
-  floatformat_to_double(&floatformat_ieee_double_big, 
-                        (const void *)ptr, 
+  EXTRACTOR_common_floatformat_to_double(&EXTRACTOR_common_floatformat_ieee_double_big,
+                        (const void *)ptr,
                         &val);
   ptr += 8;
   *data = ptr;
@@ -152,7 +152,7 @@ static int readASBoolean(const unsigned char **data,
 {
   const unsigned char *ptr = *data;
   int val;
-  
+
   if (*len < 1)
     return -1;
 
@@ -192,7 +192,7 @@ static int readASString(const unsigned char **data,
   const unsigned char *ptr = *data;
   char *ret;
   int slen;
- 
+
   if (*len < 2)
     return -1;
 
@@ -214,9 +214,9 @@ static int readASString(const unsigned char **data,
   return 0;
 }
 
-static int parse_amf(const unsigned char **data, 
+static int parse_amf(const unsigned char **data,
               size_t *len,
-              AMFParserHandler *handler) 
+              AMFParserHandler *handler)
 {
   const unsigned char *ptr = *data;
   unsigned char astype;
@@ -231,8 +231,8 @@ static int parse_amf(const unsigned char **data,
       double val;
       ret = readASNumber(&ptr, len, &val);
       if (ret == 0)
-        (*(handler->as_end_callback))(astype, 
-                                      &val, 
+        (*(handler->as_end_callback))(astype,
+                                      &val,
                                       handler->userdata);
       break;
     }
@@ -241,8 +241,8 @@ static int parse_amf(const unsigned char **data,
       int val;
       ret = readASBoolean(&ptr, len, &val);
       if (ret == 0)
-        (*(handler->as_end_callback))(astype, 
-                                      &val, 
+        (*(handler->as_end_callback))(astype,
+                                      &val,
                                       handler->userdata);
       break;
     }
@@ -251,8 +251,8 @@ static int parse_amf(const unsigned char **data,
       char *val;
       ret = readASString(&ptr, len, &val);
       if (ret == 0) {
-        (*(handler->as_end_callback))(astype, 
-                                      val, 
+        (*(handler->as_end_callback))(astype,
+                                      val,
                                       handler->userdata);
         free(val);
       }
@@ -267,8 +267,8 @@ static int parse_amf(const unsigned char **data,
       tmp[0] = &millis;
       tmp[1] = &tz;
       if (ret == 0)
-        (*(handler->as_end_callback))(astype, 
-                                      &tmp, 
+        (*(handler->as_end_callback))(astype,
+                                      &tmp,
                                       handler->userdata);
       break;
     }
@@ -293,11 +293,11 @@ static int parse_amf(const unsigned char **data,
         if (ret == -1)
           break;
       }
-      (*(handler->as_end_callback))(ASTYPE_ARRAY, 
-                                    NULL, 
+      (*(handler->as_end_callback))(ASTYPE_ARRAY,
+                                    NULL,
                                     handler->userdata);
       break;
-    }  
+    }
     case ASTYPE_OBJECT:
     {
       char *key;
@@ -306,7 +306,7 @@ static int parse_amf(const unsigned char **data,
       ret = readASString(&ptr, len, &key);
       if (ret == -1)
         break;
-      (*(handler->as_key_callback))(key, 
+      (*(handler->as_key_callback))(key,
                                     handler->userdata);
       free(key);
       type = *ptr;
@@ -317,17 +317,17 @@ static int parse_amf(const unsigned char **data,
         ret = readASString(&ptr, len, &key);
         if (ret == -1)
           break;
-        (*(handler->as_key_callback))(key, 
+        (*(handler->as_key_callback))(key,
                                       handler->userdata);
         free(key);
-        type = *ptr;      
+        type = *ptr;
       }
       if (ret == 0)
-        (*(handler->as_end_callback))(ASTYPE_OBJECT, 
-                                      NULL, 
+        (*(handler->as_end_callback))(ASTYPE_OBJECT,
+                                      NULL,
                                       handler->userdata);
       break;
-    }  
+    }
     case ASTYPE_MIXEDARRAY:
     {
       char *key;
@@ -343,7 +343,7 @@ static int parse_amf(const unsigned char **data,
       ret = readASString(&ptr, len, &key);
       if (ret == -1)
         break;
-      (*(handler->as_key_callback))(key, 
+      (*(handler->as_key_callback))(key,
                                     handler->userdata);
       free(key);
       type = *ptr;
@@ -354,21 +354,21 @@ static int parse_amf(const unsigned char **data,
         ret = readASString(&ptr, len, &key);
         if (ret == -1)
           break;
-        (*(handler->as_key_callback))(key, 
+        (*(handler->as_key_callback))(key,
                                       handler->userdata);
         free(key);
-        type = *ptr;      
+        type = *ptr;
       }
       if (ret == 0)
-        (*(handler->as_end_callback))(astype, 
-                                      NULL, 
+        (*(handler->as_end_callback))(astype,
+                                      NULL,
                                       handler->userdata);
       break;
-    }  
+    }
     default:
       ret = -1;
-      (*(handler->as_end_callback))(astype, 
-                                    NULL, 
+      (*(handler->as_end_callback))(astype,
+                                    NULL,
                                     handler->userdata);
 #if DEBUG
       printf("parse_amf: Unknown type %02x", astype);
@@ -647,11 +647,11 @@ static void handleASBegin(unsigned char type, void * userdata)
 {
   FLVMetaParserState *state = (FLVMetaParserState *)userdata;
 
-  if (state->onMetaData && state->parsingDepth == 0 && 
+  if (state->onMetaData && state->parsingDepth == 0 &&
       type != ASTYPE_MIXEDARRAY)
     state->onMetaData = 0;
 
-  if (type == ASTYPE_ARRAY || type == ASTYPE_MIXEDARRAY || 
+  if (type == ASTYPE_ARRAY || type == ASTYPE_MIXEDARRAY ||
       type == ASTYPE_OBJECT)
     state->parsingDepth++;
 }
@@ -665,13 +665,13 @@ static void handleASKey(char * key, void * userdata)
     return;
 
   i = 0;
-  while ((key_to_extractor_map[i].key != NULL) && 
+  while ((key_to_extractor_map[i].key != NULL) &&
          (strcasecmp(key, key_to_extractor_map[i].key) != 0))
     i++;
   state->currentKeyType = key_to_extractor_map[i].type;
 
   i = 0;
-  while ((key_to_attribute_map[i].key != NULL) && 
+  while ((key_to_attribute_map[i].key != NULL) &&
          (strcasecmp(key, key_to_attribute_map[i].key) != 0))
     i++;
   state->currentAttribute = key_to_attribute_map[i].attribute;
@@ -681,7 +681,7 @@ static void handleASEnd(unsigned char type, void * value, void * userdata)
 {
   FLVMetaParserState *state = (FLVMetaParserState *)userdata;
   char *s;
-  
+
   if ((state->parsingDepth == 0) && (type == ASTYPE_STRING)) {
     s = (char *)value;
     if (!strcmp(s, "onMetaData"))
@@ -692,8 +692,8 @@ static void handleASEnd(unsigned char type, void * value, void * userdata)
    * right after a "onMetaData" STRING */
 
   /* stream info related metadata */
-  if (state->onMetaData && (state->parsingDepth == 1) && 
-      (state->currentAttribute != FLV_NONE) && 
+  if (state->onMetaData && (state->parsingDepth == 1) &&
+      (state->currentAttribute != FLV_NONE) &&
       (type == ASTYPE_NUMBER))
   {
     double n = *((double *)value);
@@ -711,10 +711,10 @@ static void handleASEnd(unsigned char type, void * value, void * userdata)
         break;
       case FLV_FRAMERATE:
         state->streamInfo->videoFrameRate = n;
-        break; 
+        break;
       case FLV_VDATARATE:
         state->streamInfo->videoDataRate = n;
-        break; 
+        break;
       case FLV_ADATARATE:
         state->streamInfo->audioDataRate = n;
         break;
@@ -729,8 +729,8 @@ static void handleASEnd(unsigned char type, void * value, void * userdata)
     }
   }
 
-  if (state->onMetaData && (state->parsingDepth == 1) && 
-      (state->currentAttribute == FLV_STEREO) && 
+  if (state->onMetaData && (state->parsingDepth == 1) &&
+      (state->currentAttribute == FLV_STEREO) &&
       (type == ASTYPE_BOOLEAN))
   {
     int n = *((int *)value);
@@ -739,7 +739,7 @@ static void handleASEnd(unsigned char type, void * value, void * userdata)
   }
 
   /* metadata that maps straight to extractor keys */
-  if (state->onMetaData && (state->parsingDepth == 1) && 
+  if (state->onMetaData && (state->parsingDepth == 1) &&
       (state->currentKeyType != EXTRACTOR_UNKNOWN))
   {
     s = NULL;
@@ -779,22 +779,22 @@ static void handleASEnd(unsigned char type, void * value, void * userdata)
     }
 
     if (s != NULL)
-      state->keywords = addKeyword (state->currentKeyType, 
+      state->keywords = addKeyword (state->currentKeyType,
                                     s,
                                     state->keywords);
   }
   state->currentKeyType = EXTRACTOR_UNKNOWN;
   state->currentAttribute = FLV_NONE;
 
-  if (type == ASTYPE_ARRAY || type == ASTYPE_MIXEDARRAY || 
+  if (type == ASTYPE_ARRAY || type == ASTYPE_MIXEDARRAY ||
       type == ASTYPE_OBJECT)
     state->parsingDepth--;
 }
 
 static struct EXTRACTOR_Keywords *
-handleMetaBody(const unsigned char *data, size_t len, 
+handleMetaBody(const unsigned char *data, size_t len,
                 FLVStreamInfo *stinfo,
-                struct EXTRACTOR_Keywords *prev) 
+                struct EXTRACTOR_Keywords *prev)
 {
   AMFParserHandler handler;
   FLVMetaParserState pstate;
@@ -843,9 +843,9 @@ static char *FLVAudioSampleRates[] = {
 };
 
 static struct EXTRACTOR_Keywords *
-handleAudioBody(const unsigned char *data, size_t len, 
+handleAudioBody(const unsigned char *data, size_t len,
                 FLVStreamInfo *stinfo,
-                struct EXTRACTOR_Keywords *prev) 
+                struct EXTRACTOR_Keywords *prev)
 {
   stinfo->audioChannels = *data & 0x01;
   stinfo->audioSampleBits = (*data & 0x02) >> 1;
@@ -878,9 +878,9 @@ static int sorenson_predefined_res[][2] = {
 };
 
 static struct EXTRACTOR_Keywords *
-handleVideoBody(const unsigned char *data, size_t len, 
+handleVideoBody(const unsigned char *data, size_t len,
                 FLVStreamInfo *stinfo,
-                struct EXTRACTOR_Keywords *prev) 
+                struct EXTRACTOR_Keywords *prev)
 {
   int codecId, frameType;
 
@@ -938,7 +938,7 @@ handleVideoBody(const unsigned char *data, size_t len,
         if (separated_coeff || !filter_header) {
           data += 2;
         }
-        /* XXX encoded/displayed dimensions might vary, but which are the 
+        /* XXX encoded/displayed dimensions might vary, but which are the
          * right ones? */
         stinfo->videoWidth = (data[3]*16) - (dim_adj>>4);
         stinfo->videoHeight = (data[2]*16) - (dim_adj&0x0F);
@@ -968,7 +968,7 @@ static int readFLVTag(const unsigned char **data,
   if ((ptr + header.bodyLength) > end)
     return -1;
 
-  switch (header.type) 
+  switch (header.type)
   {
     case FLV_TAG_TYPE_AUDIO:
       head = handleAudioBody(ptr, header.bodyLength, stinfo, head);
@@ -984,7 +984,7 @@ static int readFLVTag(const unsigned char **data,
   }
 
   ptr += header.bodyLength;
-  
+
   *list = head;
   *data = ptr;
   return 0;
@@ -1038,7 +1038,7 @@ static char * printVideoFormat(FLVStreamInfo *stinfo)
       n += snprintf(s+n, len-n, "%.4f kbps", stinfo->videoDataRate);
   }
 
-  if (n == 0) 
+  if (n == 0)
     return NULL;
   return strdup(s);
 }
@@ -1058,7 +1058,7 @@ static char * printAudioFormat(FLVStreamInfo *stinfo)
     if (n > 0)
       n += snprintf(s+n, len-n, ", ");
     if (n < len)
-      n += snprintf(s+n, len-n, "%s", 
+      n += snprintf(s+n, len-n, "%s",
                     FLVAudioSampleSizes[stinfo->audioSampleBits]);
   }
 
@@ -1066,7 +1066,7 @@ static char * printAudioFormat(FLVStreamInfo *stinfo)
     if (n > 0)
       n += snprintf(s+n, len-n, ", ");
     if (n < len)
-      n += snprintf(s+n, len-n, "%s", 
+      n += snprintf(s+n, len-n, "%s",
                     FLVAudioChannels[stinfo->audioChannels]);
   }
 
@@ -1085,7 +1085,7 @@ static char * printAudioFormat(FLVStreamInfo *stinfo)
       n += snprintf(s+n, len-n, "%.4f kbps", stinfo->audioDataRate);
   }
 
-  if (n == 0) 
+  if (n == 0)
     return NULL;
   return strdup(s);
 }
diff --git a/src/plugins/gifextractor.c b/src/plugins/gifextractor.c
index def9fed..27d9c21 100644
--- a/src/plugins/gifextractor.c
+++ b/src/plugins/gifextractor.c
@@ -201,7 +201,7 @@ libextractor_gif_extract (const char *filename,
 
   if (size < GIF_HEADER_SIZE)
     return prev;
-  cat_unpack (data, GIF_HEADER_SPEC, GIF_HEADER_FIELDS (&header));
+  EXTRACTOR_common_cat_unpack (data, GIF_HEADER_SPEC, GIF_HEADER_FIELDS (&header));
   if (0 != strncmp (&header.gif[0], "GIF", 3))
     return prev;
   if (0 != strncmp (&header.version[0], "89a", 3))
@@ -222,7 +222,7 @@ libextractor_gif_extract (const char *filename,
         {
         case ',':              /* image descriptor block */
           PRINT ("skipping local color map %d\n", pos);
-          cat_unpack (&data[pos],
+          EXTRACTOR_common_cat_unpack (&data[pos],
                       GIF_DESCRIPTOR_SPEC, GIF_DESCRIPTOR_FIELDS (&gd));
           pos = skipLocalColorMap (data, pos, size, &gd);
           break;
diff --git a/src/plugins/htmlextractor.c b/src/plugins/htmlextractor.c
index 397ac47..1dafb31 100644
--- a/src/plugins/htmlextractor.c
+++ b/src/plugins/htmlextractor.c
@@ -421,7 +421,7 @@ libextractor_html_extract (const char *filename,
       if (tmp != NULL)
         {
           prev = addKeyword (tagmap[i].type,
-                             convertToUtf8 (tmp,
+              EXTRACTOR_common_convert_to_utf8 (tmp,
                                             strlen (tmp), charset), prev);
           free (tmp);
         }
@@ -434,7 +434,7 @@ libextractor_html_extract (const char *filename,
       t = tags;
       if (tagMatch ("title", t->tagStart, t->tagEnd))
         prev = addKeyword (EXTRACTOR_TITLE,
-                           convertToUtf8 (t->dataStart,
+            EXTRACTOR_common_convert_to_utf8 (t->dataStart,
                                           t->dataEnd - t->dataStart,
                                           charset), prev);
       tags = t->next;
diff --git a/src/plugins/id3v23extractor.c b/src/plugins/id3v23extractor.c
index e02b71d..4f066fe 100644
--- a/src/plugins/id3v23extractor.c
+++ b/src/plugins/id3v23extractor.c
@@ -184,17 +184,17 @@ libextractor_id3v23_extract (const char *filename,
               switch (data[pos + 10])
                 {
                 case 0x00:
-                  word = convertToUtf8 ((const char *) &data[pos + 11],
+                  word = EXTRACTOR_common_convert_to_utf8 ((const char *) &data[pos + 11],
                                         csize, "ISO-8859-1");
                   break;
                 case 0x01:
-                  word = convertToUtf8 ((const char *) &data[pos + 11],
+                  word = EXTRACTOR_common_convert_to_utf8 ((const char *) &data[pos + 11],
                                         csize, "UCS-2");
                   break;
                 default:
                   /* bad encoding byte,
                      try to convert from iso-8859-1 */
-                  word = convertToUtf8 ((const char *) &data[pos + 11],
+                  word = EXTRACTOR_common_convert_to_utf8 ((const char *) &data[pos + 11],
                                         csize, "ISO-8859-1");
                   break;
                 }
diff --git a/src/plugins/id3v24extractor.c b/src/plugins/id3v24extractor.c
index aa35925..aec3031 100644
--- a/src/plugins/id3v24extractor.c
+++ b/src/plugins/id3v24extractor.c
@@ -184,15 +184,15 @@ libextractor_id3v24_extract (const char *filename,
               switch (data[pos + 10])
                 {
                 case 0x00:
-                  word = convertToUtf8 ((const char *) &data[pos + 11],
+                  word = EXTRACTOR_common_convert_to_utf8 ((const char *) &data[pos + 11],
                                         csize, "ISO-8859-1");
                   break;
                 case 0x01:
-                  word = convertToUtf8 ((const char *) &data[pos + 11],
+                  word = EXTRACTOR_common_convert_to_utf8 ((const char *) &data[pos + 11],
                                         csize, "UTF-16");
                   break;
                 case 0x02:
-                  word = convertToUtf8 ((const char *) &data[pos + 11],
+                  word = EXTRACTOR_common_convert_to_utf8 ((const char *) &data[pos + 11],
                                         csize, "UTF-16BE");
                   break;
                 case 0x03:
@@ -203,7 +203,7 @@ libextractor_id3v24_extract (const char *filename,
                 default:
                   /* bad encoding byte,
                      try to convert from iso-8859-1 */
-                  word = convertToUtf8 ((const char *) &data[pos + 11],
+                  word = EXTRACTOR_common_convert_to_utf8 ((const char *) &data[pos + 11],
                                         csize, "ISO-8859-1");
                   break;
                 }
diff --git a/src/plugins/id3v2extractor.c b/src/plugins/id3v2extractor.c
index 562ca2d..00e353c 100644
--- a/src/plugins/id3v2extractor.c
+++ b/src/plugins/id3v2extractor.c
@@ -131,17 +131,17 @@ libextractor_id3v2_extract (const char *filename,
               switch (data[pos + 6])
                 {
                 case 0x00:
-                  word = convertToUtf8 ((const char *) &data[pos + 7],
+                  word = EXTRACTOR_common_convert_to_utf8 ((const char *) &data[pos + 7],
                                         csize, "ISO-8859-1");
                   break;
                 case 0x01:
-                  word = convertToUtf8 ((const char *) &data[pos + 7],
+                  word = EXTRACTOR_common_convert_to_utf8 ((const char *) &data[pos + 7],
                                         csize, "UCS-2");
                   break;
                 default:
                   /* bad encoding byte,
                      try to convert from iso-8859-1 */
-                  word = convertToUtf8 ((const char *) &data[pos + 7],
+                  word = EXTRACTOR_common_convert_to_utf8 ((const char *) &data[pos + 7],
                                         csize, "ISO-8859-1");
                   break;
                 }
diff --git a/src/plugins/mp3extractor.c b/src/plugins/mp3extractor.c
index 201a332..b0b2d0c 100644
--- a/src/plugins/mp3extractor.c
+++ b/src/plugins/mp3extractor.c
@@ -290,19 +290,19 @@ get_id3 (const char *data, size_t size, id3tag * id3)
     return INVALID_ID3;
   pos += 3;
 
-  id3->title = convertToUtf8 (pos, 30, "ISO-8859-1");
+  id3->title = EXTRACTOR_common_convert_to_utf8 (pos, 30, "ISO-8859-1");
   trim (id3->title);
   pos += 30;
-  id3->artist = convertToUtf8 (pos, 30, "ISO-8859-1");
+  id3->artist = EXTRACTOR_common_convert_to_utf8 (pos, 30, "ISO-8859-1");
   trim (id3->artist);
   pos += 30;
-  id3->album = convertToUtf8 (pos, 30, "ISO-8859-1");
+  id3->album = EXTRACTOR_common_convert_to_utf8 (pos, 30, "ISO-8859-1");
   trim (id3->album);
   pos += 30;
-  id3->year = convertToUtf8 (pos, 4, "ISO-8859-1");
+  id3->year = EXTRACTOR_common_convert_to_utf8 (pos, 4, "ISO-8859-1");
   trim (id3->year);
   pos += 4;
-  id3->comment = convertToUtf8 (pos, 30, "ISO-8859-1");
+  id3->comment = EXTRACTOR_common_convert_to_utf8 (pos, 30, "ISO-8859-1");
   trim (id3->comment);
   if ( (pos[28] == '\0') &&
        (pos[29] != '\0') )
@@ -419,14 +419,14 @@ mp3parse (const unsigned char *data, size_t size, struct EXTRACTOR_Keywords *pre
         idx_num = (mpeg_ver - 1) * 3 + layer - 1;
       else
         idx_num = 2 + layer;
-      bitrate = 1000 * bitrate_table[(header >> MPA_BITRATE_SHIFT) & 
+      bitrate = 1000 * bitrate_table[(header >> MPA_BITRATE_SHIFT) &
                                      MPA_BITRATE_MASK][idx_num];
       if (bitrate < 0)
         {
           frames--;
           break;
         }                       /*error in header */
-      sample_rate = freq_table[(header >> MPA_FREQ_SHIFT) & 
+      sample_rate = freq_table[(header >> MPA_FREQ_SHIFT) &
                                MPA_FREQ_MASK][mpeg_ver - 1];
       if (sample_rate < 0)
         {
@@ -468,17 +468,17 @@ mp3parse (const unsigned char *data, size_t size, struct EXTRACTOR_Keywords *pre
 
   prev = addkword (prev, mpeg_versions[mpeg_ver-1], EXTRACTOR_RESOURCE_TYPE);
   format = malloc (512);
-  snprintf (format, 512, "%s %s audio, %d kbps (%s), %d Hz, %s, %s, %s", 
+  snprintf (format, 512, "%s %s audio, %d kbps (%s), %d Hz, %s, %s, %s",
             mpeg_versions[mpeg_ver-1],
             layer_names[layer-1],
-            avg_bps, 
-            vbr_flag ? _("VBR") : _("CBR"), 
-            sample_rate, 
+            avg_bps,
+            vbr_flag ? _("VBR") : _("CBR"),
+            sample_rate,
             channel_modes[ch],
-            copyright_flag ? _("copyright") : _("no copyright"), 
+            copyright_flag ? _("copyright") : _("no copyright"),
             original_flag ? _("original") : _("copy") );
   prev = addkword (prev, format, EXTRACTOR_FORMAT);
-  snprintf (format, 512, "%dm%02d", 
+  snprintf (format, 512, "%dm%02d",
             length / 60, length % 60);
   prev = addkword (prev, format, EXTRACTOR_DURATION);
   free (format);
@@ -522,7 +522,7 @@ libextractor_mp3_extract (const char *filename,
                  strlen (info.album) + 6);
   sprintf (word, "%s: %s (%s)", info.artist, info.title, info.album);
   klist = addkword (klist, word, EXTRACTOR_DESCRIPTION);
-  
+
   free (word);
   free (info.title);
   free (info.year);
diff --git a/src/plugins/ole2/ole2extractor.c b/src/plugins/ole2/ole2extractor.c
index 6933986..b3ba87b 100644
--- a/src/plugins/ole2/ole2extractor.c
+++ b/src/plugins/ole2/ole2extractor.c
@@ -27,7 +27,7 @@
 
 #include "platform.h"
 #include "extractor.h"
-#include "../convert.h"
+#include "convert.h"
 
 #include <glib-object.h>
 #include <string.h>
@@ -394,14 +394,14 @@ history_extract(GsfInput * stream,
   // there are n strings, so n/2 revisions (author & file)
   nRev = (lbuffer[2] + (lbuffer[3] << 8)) / 2;
   where = 6;
-  for (i=0; i < nRev; i++) {    
+  for (i=0; i < nRev; i++) {
     if (where >= lcbSttbSavedBy)
       break;
     length = lbuffer[where++];
     if ( (where + 2 * length + 2 >= lcbSttbSavedBy) ||
          (where + 2 * length + 2 <= where) )
       break;
-    author = convertToUtf8((const char*) &lbuffer[where],
+    author = EXTRACTOR_common_convert_to_utf8((const char*) &lbuffer[where],
                            length * 2,
                            "UTF-16BE");
     where += length * 2 + 1;
@@ -411,9 +411,9 @@ history_extract(GsfInput * stream,
       free(author);
       break;
     }
-    filename = convertToUtf8((const char*) &lbuffer[where],
+    filename = EXTRACTOR_common_convert_to_utf8((const char*) &lbuffer[where],
                              length * 2,
-                             "UTF-16BE");       
+                             "UTF-16BE");
     where += length * 2 + 1;
     rbuf = malloc(strlen(author) + strlen(filename) + 512);
     snprintf(rbuf, 512 + strlen(author) + strlen(filename),
diff --git a/src/plugins/pdf/pdfextractor.cc b/src/plugins/pdf/pdfextractor.cc
index 9ec37a8..01fe7c9 100644
--- a/src/plugins/pdf/pdfextractor.cc
+++ b/src/plugins/pdf/pdfextractor.cc
@@ -24,7 +24,7 @@
 
 #include "platform.h"
 #include "extractor.h"
-#include "../convert.h"
+#include "convert.h"
 #include <math.h>
 
 #include "parseargs.h"
@@ -74,7 +74,7 @@ extern "C" {
           (((unsigned char)s[1]) & 0xff) == 0xff) {
         char * result;
 
-        result = convertToUtf8((const char*) &s[2], s1->getLength() - 2, "UTF-16BE");
+        result = EXTRACTOR_common_convert_to_utf8((const char*) &s[2], s1->getLength() - 2, "UTF-16BE");
         next = addKeyword(type,
                           result,
                           next);
@@ -108,7 +108,7 @@ extern "C" {
 
         if (0 < len) {
           next = addKeyword(type,
-                          convertToUtf8(s, len,
+              EXTRACTOR_common_convert_to_utf8(s, len,
                                         "ISO-8859-1"),
                           next);
         }
@@ -135,7 +135,7 @@ extern "C" {
         /* isUnicode */
         char * result;
 
-        result = convertToUtf8((const char*)&s[2], s1->getLength() - 2, "UTF-16BE");
+        result = EXTRACTOR_common_convert_to_utf8((const char*)&s[2], s1->getLength() - 2, "UTF-16BE");
         next = addKeyword(type,
                           result,
                           next);
diff --git a/src/plugins/pdfextractor.c b/src/plugins/pdfextractor.c
index 0ab15d0..e31262d 100644
--- a/src/plugins/pdfextractor.c
+++ b/src/plugins/pdfextractor.c
@@ -206,11 +206,11 @@ charsetDecode (const unsigned char *in, size_t size)
       /* TODO: extend glibc with
          character set that corresponds to
          Adobe's extended ISOLATIN1 encoding! */
-      return convertToUtf8 ((const char *) in, size, "CSISOLATIN1");
+      return EXTRACTOR_common_convert_to_utf8 ((const char *) in, size, "CSISOLATIN1");
     }
   else
     {
-      return convertToUtf8 ((const char *) &in[2], size - 2, "UTF-16BE");
+      return EXTRACTOR_common_convert_to_utf8 ((const char *) &in[2], size - 2, "UTF-16BE");
     }
 }
 
diff --git a/src/plugins/pngextractor.c b/src/plugins/pngextractor.c
index ee3706b..991afa2 100644
--- a/src/plugins/pngextractor.c
+++ b/src/plugins/pngextractor.c
@@ -115,7 +115,7 @@ processtEXt (const char *data,
   off = stnlen (data, length) + 1;
   if (off >= length)
     return prev;                /* failed to find '\0' */
-  keyword = convertToUtf8 (&data[off], length - off, "ISO-8859-1");
+  keyword = EXTRACTOR_common_convert_to_utf8 (&data[off], length - off, "ISO-8859-1");
   i = 0;
   while (tagmap[i].name != NULL)
     {
@@ -275,7 +275,7 @@ processzTXt (const char *data,
       if (ret != Z_BUF_ERROR)
         return prev;            /* unknown error, abort */
     }
-  keyword = convertToUtf8 (buf, bufLen, "ISO-8859-1");
+  keyword = EXTRACTOR_common_convert_to_utf8 (buf, bufLen, "ISO-8859-1");
   free (buf);
   i = 0;
   while (tagmap[i].name != NULL)
diff --git a/src/plugins/tiffextractor.c b/src/plugins/tiffextractor.c
index f845c7f..a9d23da 100644
--- a/src/plugins/tiffextractor.c
+++ b/src/plugins/tiffextractor.c
@@ -129,7 +129,7 @@ libextractor_tiff_extract (char *filename,
 #if __BYTE_ORDER == __BIG_ENDIAN
   byteOrder = 1 - byteOrder;
 #endif
-  cat_unpack (data, TIFF_HEADER_SPECS[byteOrder], TIFF_HEADER_FIELDS (&hdr));
+  EXTRACTOR_common_cat_unpack (data, TIFF_HEADER_SPECS[byteOrder], TIFF_HEADER_FIELDS (&hdr));
   if (hdr.fourty_two != 42)
     return prev;                /* can not be tiff */
   if (hdr.ifd_offset + 6 > size)
@@ -159,7 +159,7 @@ libextractor_tiff_extract (char *filename,
           DIRECTORY_ENTRY entry;
           off = current_ifd + 2 + DIRECTORY_ENTRY_SIZE * i;
 
-          cat_unpack (&data[off],
+          EXTRACTOR_common_cat_unpack (&data[off],
                       DIRECTORY_ENTRY_SPECS[byteOrder],
                       DIRECTORY_ENTRY_FIELDS (&entry));
           switch (entry.tag)