    char [7]                      /* output string                              */
  );
  
---- /dev/null
-+++ b/spro/sptables.h
-@@ -0,0 +1,81 @@
-+/* Tables for Alaw and Ulaw decoding
-+
-+   Obtained from the SOX software, respect to Jef Poskanzer.
-+
-+*/
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+short sp_ulaw_exp_table[256] = {
-+	 -32124,-31100,-30076,-29052,-28028,-27004,-25980,-24956,
-+	 -23932,-22908,-21884,-20860,-19836,-18812,-17788,-16764,
-+	 -15996,-15484,-14972,-14460,-13948,-13436,-12924,-12412,
-+	 -11900,-11388,-10876,-10364, -9852, -9340, -8828, -8316,
-+	  -7932, -7676, -7420, -7164, -6908, -6652, -6396, -6140,
-+	  -5884, -5628, -5372, -5116, -4860, -4604, -4348, -4092,
-+	  -3900, -3772, -3644, -3516, -3388, -3260, -3132, -3004,
-+	  -2876, -2748, -2620, -2492, -2364, -2236, -2108, -1980,
-+	  -1884, -1820, -1756, -1692, -1628, -1564, -1500, -1436,
-+	  -1372, -1308, -1244, -1180, -1116, -1052,  -988,  -924,
-+	   -876,  -844,  -812,  -780,  -748,  -716,  -684,  -652,
-+	   -620,  -588,  -556,  -524,  -492,  -460,  -428,  -396,
-+	   -372,  -356,  -340,  -324,  -308,  -292,  -276,  -260,
-+	   -244,  -228,  -212,  -196,  -180,  -164,  -148,  -132,
-+	   -120,  -112,  -104,   -96,   -88,   -80,   -72,   -64,
-+	    -56,   -48,   -40,   -32,   -24,   -16,    -8,     0,
-+	  32124, 31100, 30076, 29052, 28028, 27004, 25980, 24956,
-+	  23932, 22908, 21884, 20860, 19836, 18812, 17788, 16764,
-+	  15996, 15484, 14972, 14460, 13948, 13436, 12924, 12412,
-+	  11900, 11388, 10876, 10364,  9852,  9340,  8828,  8316,
-+	   7932,  7676,  7420,  7164,  6908,  6652,  6396,  6140,
-+	   5884,  5628,  5372,  5116,  4860,  4604,  4348,  4092,
-+	   3900,  3772,  3644,  3516,  3388,  3260,  3132,  3004,
-+	   2876,  2748,  2620,  2492,  2364,  2236,  2108,  1980,
-+	   1884,  1820,  1756,  1692,  1628,  1564,  1500,  1436,
-+	   1372,  1308,  1244,  1180,  1116,  1052,   988,   924,
-+	    876,   844,   812,   780,   748,   716,   684,   652,
-+	    620,   588,   556,   524,   492,   460,   428,   396,
-+	    372,   356,   340,   324,   308,   292,   276,   260,
-+	    244,   228,   212,   196,   180,   164,   148,   132,
-+	    120,   112,   104,    96,    88,    80,    72,    64,
-+	     56,    48,    40,    32,    24,    16,     8,     0};
-+
-+short sp_alaw_exp_table[256] = {
-+	  -5504, -5248, -6016, -5760, -4480, -4224, -4992, -4736,
-+	  -7552, -7296, -8064, -7808, -6528, -6272, -7040, -6784,
-+	  -2752, -2624, -3008, -2880, -2240, -2112, -2496, -2368,
-+	  -3776, -3648, -4032, -3904, -3264, -3136, -3520, -3392,
-+	 -22016,-20992,-24064,-23040,-17920,-16896,-19968,-18944,
-+	 -30208,-29184,-32256,-31232,-26112,-25088,-28160,-27136,
-+	 -11008,-10496,-12032,-11520, -8960, -8448, -9984, -9472,
-+	 -15104,-14592,-16128,-15616,-13056,-12544,-14080,-13568,
-+	   -344,  -328,  -376,  -360,  -280,  -264,  -312,  -296,
-+	   -472,  -456,  -504,  -488,  -408,  -392,  -440,  -424,
-+	    -88,   -72,  -120,  -104,   -24,    -8,   -56,   -40,
-+	   -216,  -200,  -248,  -232,  -152,  -136,  -184,  -168,
-+	  -1376, -1312, -1504, -1440, -1120, -1056, -1248, -1184,
-+	  -1888, -1824, -2016, -1952, -1632, -1568, -1760, -1696,
-+	   -688,  -656,  -752,  -720,  -560,  -528,  -624,  -592,
-+	   -944,  -912, -1008,  -976,  -816,  -784,  -880,  -848,
-+	   5504,  5248,  6016,  5760,  4480,  4224,  4992,  4736,
-+	   7552,  7296,  8064,  7808,  6528,  6272,  7040,  6784,
-+	   2752,  2624,  3008,  2880,  2240,  2112,  2496,  2368,
-+	   3776,  3648,  4032,  3904,  3264,  3136,  3520,  3392,
-+	  22016, 20992, 24064, 23040, 17920, 16896, 19968, 18944,
-+	  30208, 29184, 32256, 31232, 26112, 25088, 28160, 27136,
-+	  11008, 10496, 12032, 11520,  8960,  8448,  9984,  9472,
-+	  15104, 14592, 16128, 15616, 13056, 12544, 14080, 13568,
-+	    344,   328,   376,   360,   280,   264,   312,   296,
-+	    472,   456,   504,   488,   408,   392,   440,   424,
-+	     88,    72,   120,   104,    24,     8,    56,    40,
-+	    216,   200,   248,   232,   152,   136,   184,   168,
-+	   1376,  1312,  1504,  1440,  1120,  1056,  1248,  1184,
-+	   1888,  1824,  2016,  1952,  1632,  1568,  1760,  1696,
-+	    688,   656,   752,   720,   560,   528,   624,   592,
-+	    944,   912,  1008,   976,   816,   784,   880,   848};
-+
-+#ifdef __cplusplus
-+}
-+#endif
---- /dev/null
-+++ b/spro/system.h
-@@ -0,0 +1,108 @@
-+/******************************************************************************/
-+/*                                                                            */
-+/*                                system.h                                    */
-+/*                                                                            */
-+/*                               SPro Library                                 */
-+/*                                                                            */
-+/* Guig                                                             Sep. 2002 */
-+/* -------------------------------------------------------------------------- */
-+/*
-+   $Author: guig $
-+   $Date: 2010-11-09 16:57:22 +0100 (Tue, 09 Nov 2010) $
-+   $Revision: 151 $
-+*/
-+/*
-+   Copyright (C) 1997-2010 Guillaume Gravier (guig@irisa.fr)
-+
-+   Permission is hereby granted, free of charge, to any person
-+   obtaining a copy of this software and associated documentation
-+   files (the "Software"), to deal in the Software without
-+   restriction, including without limitation the rights to use, copy,
-+   modify, merge, publish, distribute, sublicense, and/or sell copies
-+   of the Software, and to permit persons to whom the Software is
-+   furnished to do so, subject to the following conditions:
-+
-+   The above copyright notice and this permission notice shall be
-+   included in all copies or substantial portions of the Software.
-+
-+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-+   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-+   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+   SOFTWARE.
-+*/
-+
-+/*
-+ * System dependent includes and defines.
-+ */
-+
-+#ifndef _system_h_
-+# define _system_h_
-+
-+# ifdef HAVE_CONFIG_H
-+#  include <config.h>
-+# endif
-+
-+# include <stdio.h>
-+# include <stdint.h>
-+
-+/* stdlib stuff */
-+# if STDC_HEADERS
-+#  include <stdlib.h>
-+#  include <stddef.h>
-+#  include <stdarg.h>
-+# else
-+#  if HAVE_STDLIB_H
-+#   include <stdlib.h>
-+#  endif
-+# endif
-+
-+# if defined STDC_HEADERS || defined _LIBC
-+#   include <stdlib.h>
-+# elif defined HAVE_MALLOC_H
-+#   include <malloc.h>
-+# endif
-+
-+# if HAVE_UNISTD_H
-+#  include <unistd.h>
-+# endif
-+
-+/* string stuff */
-+# if HAVE_STRING_H
-+#  if !STDC_HEADERS && HAVE_MEMORY_H
-+#   include <memory.h>
-+#  endif
-+#  include <string.h>
-+# endif
-+
-+/* mathematics */
-+# if HAVE_MATH_H
-+#  include <math.h>
-+# endif
-+
-+/* limits */
-+# if HAVE_LIMITS_H
-+#  include <limits.h>
-+# endif
-+/* some systems (at least mine) do not define properly the following limits.... */
-+# ifndef FLT_MIN
-+#  define FLT_MIN 1.17549435E-38F
-+# endif
-+# ifndef FLT_MAX
-+#  define FLT_MAX 3.40282347e+38F
-+# endif
-+# ifndef DBL_MIN
-+#  define DBL_MIN 2.2250738585072014E-308
-+# endif
-+# ifndef DBL_MAX
-+#  define DBL_MAX 1.7976931348623157E+308
-+# endif
-+
-+# if HAVE_SYS_TYPES_H
-+#  include <sys/types.h>
-+# endif
-+
-+#endif /* _system_h_ */
---- a/sptables.h
-+++ /dev/null
-@@ -1,81 +0,0 @@
--/* Tables for Alaw and Ulaw decoding
--
--   Obtained from the SOX software, respect to Jef Poskanzer.
--
--*/
--
--#ifdef __cplusplus
--extern "C" {
--#endif
--
--short sp_ulaw_exp_table[256] = {
--	 -32124,-31100,-30076,-29052,-28028,-27004,-25980,-24956,
--	 -23932,-22908,-21884,-20860,-19836,-18812,-17788,-16764,
--	 -15996,-15484,-14972,-14460,-13948,-13436,-12924,-12412,
--	 -11900,-11388,-10876,-10364, -9852, -9340, -8828, -8316,
--	  -7932, -7676, -7420, -7164, -6908, -6652, -6396, -6140,
--	  -5884, -5628, -5372, -5116, -4860, -4604, -4348, -4092,
--	  -3900, -3772, -3644, -3516, -3388, -3260, -3132, -3004,
--	  -2876, -2748, -2620, -2492, -2364, -2236, -2108, -1980,
--	  -1884, -1820, -1756, -1692, -1628, -1564, -1500, -1436,
--	  -1372, -1308, -1244, -1180, -1116, -1052,  -988,  -924,
--	   -876,  -844,  -812,  -780,  -748,  -716,  -684,  -652,
--	   -620,  -588,  -556,  -524,  -492,  -460,  -428,  -396,
--	   -372,  -356,  -340,  -324,  -308,  -292,  -276,  -260,
--	   -244,  -228,  -212,  -196,  -180,  -164,  -148,  -132,
--	   -120,  -112,  -104,   -96,   -88,   -80,   -72,   -64,
--	    -56,   -48,   -40,   -32,   -24,   -16,    -8,     0,
--	  32124, 31100, 30076, 29052, 28028, 27004, 25980, 24956,
--	  23932, 22908, 21884, 20860, 19836, 18812, 17788, 16764,
--	  15996, 15484, 14972, 14460, 13948, 13436, 12924, 12412,
--	  11900, 11388, 10876, 10364,  9852,  9340,  8828,  8316,
--	   7932,  7676,  7420,  7164,  6908,  6652,  6396,  6140,
--	   5884,  5628,  5372,  5116,  4860,  4604,  4348,  4092,
--	   3900,  3772,  3644,  3516,  3388,  3260,  3132,  3004,
--	   2876,  2748,  2620,  2492,  2364,  2236,  2108,  1980,
--	   1884,  1820,  1756,  1692,  1628,  1564,  1500,  1436,
--	   1372,  1308,  1244,  1180,  1116,  1052,   988,   924,
--	    876,   844,   812,   780,   748,   716,   684,   652,
--	    620,   588,   556,   524,   492,   460,   428,   396,
--	    372,   356,   340,   324,   308,   292,   276,   260,
--	    244,   228,   212,   196,   180,   164,   148,   132,
--	    120,   112,   104,    96,    88,    80,    72,    64,
--	     56,    48,    40,    32,    24,    16,     8,     0};
--
--short sp_alaw_exp_table[256] = {
--	  -5504, -5248, -6016, -5760, -4480, -4224, -4992, -4736,
--	  -7552, -7296, -8064, -7808, -6528, -6272, -7040, -6784,
--	  -2752, -2624, -3008, -2880, -2240, -2112, -2496, -2368,
--	  -3776, -3648, -4032, -3904, -3264, -3136, -3520, -3392,
--	 -22016,-20992,-24064,-23040,-17920,-16896,-19968,-18944,
--	 -30208,-29184,-32256,-31232,-26112,-25088,-28160,-27136,
--	 -11008,-10496,-12032,-11520, -8960, -8448, -9984, -9472,
--	 -15104,-14592,-16128,-15616,-13056,-12544,-14080,-13568,
--	   -344,  -328,  -376,  -360,  -280,  -264,  -312,  -296,
--	   -472,  -456,  -504,  -488,  -408,  -392,  -440,  -424,
--	    -88,   -72,  -120,  -104,   -24,    -8,   -56,   -40,
--	   -216,  -200,  -248,  -232,  -152,  -136,  -184,  -168,
--	  -1376, -1312, -1504, -1440, -1120, -1056, -1248, -1184,
--	  -1888, -1824, -2016, -1952, -1632, -1568, -1760, -1696,
--	   -688,  -656,  -752,  -720,  -560,  -528,  -624,  -592,
--	   -944,  -912, -1008,  -976,  -816,  -784,  -880,  -848,
--	   5504,  5248,  6016,  5760,  4480,  4224,  4992,  4736,
--	   7552,  7296,  8064,  7808,  6528,  6272,  7040,  6784,
--	   2752,  2624,  3008,  2880,  2240,  2112,  2496,  2368,
--	   3776,  3648,  4032,  3904,  3264,  3136,  3520,  3392,
--	  22016, 20992, 24064, 23040, 17920, 16896, 19968, 18944,
--	  30208, 29184, 32256, 31232, 26112, 25088, 28160, 27136,
--	  11008, 10496, 12032, 11520,  8960,  8448,  9984,  9472,
--	  15104, 14592, 16128, 15616, 13056, 12544, 14080, 13568,
--	    344,   328,   376,   360,   280,   264,   312,   296,
--	    472,   456,   504,   488,   408,   392,   440,   424,
--	     88,    72,   120,   104,    24,     8,    56,    40,
--	    216,   200,   248,   232,   152,   136,   184,   168,
--	   1376,  1312,  1504,  1440,  1120,  1056,  1248,  1184,
--	   1888,  1824,  2016,  1952,  1632,  1568,  1760,  1696,
--	    688,   656,   752,   720,   560,   528,   624,   592,
--	    944,   912,  1008,   976,   816,   784,   880,   848};
--
--#ifdef __cplusplus
--}
--#endif
---- a/system.h
-+++ /dev/null
-@@ -1,107 +0,0 @@
--/******************************************************************************/
--/*                                                                            */
--/*                                system.h                                    */
--/*                                                                            */
--/*                               SPro Library                                 */
--/*                                                                            */
--/* Guig                                                             Sep. 2002 */
--/* -------------------------------------------------------------------------- */
--/*
--   $Author: guig $
--   $Date: 2010-11-09 16:57:22 +0100 (Tue, 09 Nov 2010) $
--   $Revision: 151 $
--*/
--/*  
--   Copyright (C) 1997-2010 Guillaume Gravier (guig@irisa.fr)
--
--   Permission is hereby granted, free of charge, to any person
--   obtaining a copy of this software and associated documentation
--   files (the "Software"), to deal in the Software without
--   restriction, including without limitation the rights to use, copy,
--   modify, merge, publish, distribute, sublicense, and/or sell copies
--   of the Software, and to permit persons to whom the Software is
--   furnished to do so, subject to the following conditions:
--
--   The above copyright notice and this permission notice shall be
--   included in all copies or substantial portions of the Software.
--
--   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
--   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
--   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
--   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
--   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
--   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
--   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
--   SOFTWARE.
--*/
--
--/*
-- * System dependent includes and defines.
-- */
--
--#ifndef _system_h_
--# define _system_h_
--
--# ifdef HAVE_CONFIG_H
--#  include <config.h>
--# endif
--
--# include <stdio.h>
--
--/* stdlib stuff */
--# if STDC_HEADERS
--#  include <stdlib.h>
--#  include <stddef.h>
--#  include <stdarg.h>
--# else
--#  if HAVE_STDLIB_H
--#   include <stdlib.h>
--#  endif
--# endif
--
--# if defined STDC_HEADERS || defined _LIBC
--#   include <stdlib.h>
--# elif defined HAVE_MALLOC_H
--#   include <malloc.h>
--# endif
--
--# if HAVE_UNISTD_H
--#  include <unistd.h>
--# endif
--
--/* string stuff */
--# if HAVE_STRING_H
--#  if !STDC_HEADERS && HAVE_MEMORY_H
--#   include <memory.h>
--#  endif
--#  include <string.h>
--# endif
--
--/* mathematics */
--# if HAVE_MATH_H
--#  include <math.h>
--# endif
--
--/* limits */
--# if HAVE_LIMITS_H
--#  include <limits.h>
--# endif
--/* some systems (at least mine) do not define properly the following limits.... */
--# ifndef FLT_MIN
--#  define FLT_MIN 1.17549435E-38F
--# endif
--# ifndef FLT_MAX
--#  define FLT_MAX 3.40282347e+38F
--# endif
--# ifndef DBL_MIN
--#  define DBL_MIN 2.2250738585072014E-308
--# endif
--# ifndef DBL_MAX
--#  define DBL_MAX 1.7976931348623157E+308
--# endif
--
--# if HAVE_SYS_TYPES_H
--#  include <sys/types.h>
--# endif
--
--#endif /* _system_h_ */

 AC_CHECK_SIZEOF(long)
 
 dnl Checks for header files
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,11 +43,12 @@
 LDADD    = -lm -L. -lspro @sphere_lib@
 INCLUDES = @sphere_include@
 
-include_HEADERS = spro.h sptables.h
+include_HEADERS = spro.h
 lib_LIBRARIES = libspro.a
 noinst_HEADERS = gggetopt.h
+pkginclude_HEADERS = spro/system.h spro/sptables.h
 
-libspro_a_SOURCES = system.h spro.h sptables.h sig.c spf.c header.c misc.c lpc.c convert.c fft.c
+libspro_a_SOURCES = spro.h sig.c spf.c header.c misc.c lpc.c convert.c fft.c
 
 bin_PROGRAMS = scopy slpc slpcep sfbank sfbcep splp
 noinst_PROGRAMS = scompare
--- a/spro.h
+++ b/spro.h
@@ -33,7 +33,7 @@
    ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
    CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
    SOFTWARE.
-*/
+ */
 
 /*
  * SPro library header 
@@ -63,7 +63,7 @@
 extern "C" {
 # endif
 
-# include <system.h>
+# include "spro/system.h"
 
      /* ----------------------- */
      /* ----- error codes ----- */
@@ -175,11 +175,11 @@
   float Fs;                     /* frame rate       
                           */

   float rate;
 
   if ((s = (spfstream_t *)malloc(sizeof(spfstream_t))) == NULL) {
@@ -505,12 +505,12 @@
   
 #ifdef WORDS_BIGENDIAN
