diff -pruN -x '*.m4' -x '*.Po' -x '*.o' -x '*.a' -x Makefile -x Makefile.in -x 'autom4te.cache*' soundmodem-0.18-orig/newqpsk/complex.h soundmodem-0.18-modified/newqpsk/complex.h
--- soundmodem-0.18-orig/newqpsk/complex.h	2008-12-14 15:26:31.000000000 +0100
+++ soundmodem-0.18-modified/newqpsk/complex.h	2015-12-20 21:41:56.333670664 +0100
@@ -13,7 +13,7 @@ typedef struct {
 /*
  * Complex multiplication.
  */
-extern __inline__ complex cmul(complex x, complex y)
+__inline__ complex cmul(complex x, complex y)
 {
 	complex z;
 
@@ -27,7 +27,7 @@ extern __inline__ complex cmul(complex x
  * Complex ... yeah, what??? Returns a complex number that has the
  * properties: |z| = |x| * |y|  and  arg(z) = arg(y) - arg(x)
  */
-extern __inline__ complex ccor(complex x, complex y)
+__inline__ complex ccor(complex x, complex y)
 {
 	complex z;
 
@@ -40,7 +40,7 @@ extern __inline__ complex ccor(complex x
 /*
  * Real part of the complex ???
  */
-extern __inline__ float ccorI(complex x, complex y)
+__inline__ float ccorI(complex x, complex y)
 {
 	return x.re * y.re + x.im * y.im;
 }
@@ -48,7 +48,7 @@ extern __inline__ float ccorI(complex x,
 /*
  * Imaginary part of the complex ???
  */
-extern __inline__ float ccorQ(complex x, complex y)
+__inline__ float ccorQ(complex x, complex y)
 {
 	return x.re * y.im - x.im * y.re;
 }
@@ -56,7 +56,7 @@ extern __inline__ float ccorQ(complex x,
 /*
  * Modulo (absolute value) of a complex number.
  */
-extern __inline__ float cmod(complex x)
+__inline__ float cmod(complex x)
 {
 	return sqrt(x.re * x.re + x.im * x.im);
 }
@@ -64,7 +64,7 @@ extern __inline__ float cmod(complex x)
 /*
  * Square of the absolute value (power).
  */
-extern __inline__ float cpwr(complex x)
+__inline__ float cpwr(complex x)
 {
 	return (x.re * x.re + x.im * x.im);
 }
@@ -72,7 +72,7 @@ extern __inline__ float cpwr(complex x)
 /*
  * Argument of a complex number.
  */
-extern __inline__ float carg(complex x)
+__inline__ float carg(complex x)
 {
 	return atan2(x.im, x.re);
 }
diff -pruN -x '*.m4' -x '*.Po' -x '*.o' -x '*.a' -x Makefile -x Makefile.in -x 'autom4te.cache*' soundmodem-0.18-orig/newqpsk/fec.h soundmodem-0.18-modified/newqpsk/fec.h
--- soundmodem-0.18-orig/newqpsk/fec.h	2002-08-09 22:01:52.000000000 +0200
+++ soundmodem-0.18-modified/newqpsk/fec.h	2015-12-20 21:42:36.417106484 +0100
@@ -13,7 +13,7 @@ struct fecstate {
 
 /* --------------------------------------------------------------------- */
 
-extern inline void init_fec(struct fecstate *f)
+inline void init_fec(struct fecstate *f)
 {
 	switch (f->feclevel) {
 	case 0:
@@ -33,7 +33,7 @@ extern inline void init_fec(struct fecst
 
 /* --------------------------------------------------------------------- */
 
-extern inline void init_inlv(struct fecstate *f)
+inline void init_inlv(struct fecstate *f)
 {
         int i;
 
diff -pruN -x '*.m4' -x '*.Po' -x '*.o' -x '*.a' -x Makefile -x Makefile.in -x 'autom4te.cache*' soundmodem-0.18-orig/newqpsk/filter.h soundmodem-0.18-modified/newqpsk/filter.h
--- soundmodem-0.18-orig/newqpsk/filter.h	2002-08-09 22:01:52.000000000 +0200
+++ soundmodem-0.18-modified/newqpsk/filter.h	2015-12-20 21:43:10.290474953 +0100
@@ -12,7 +12,7 @@
 /* ---------------------------------------------------------------------- */
 
 #ifndef __HAVE_ARCH_MAC
-extern inline float mac(const float *a, const float *b, unsigned int size)
+inline float mac(const float *a, const float *b, unsigned int size)
 {
 	float sum = 0;
 	unsigned int i;
diff -pruN -x '*.m4' -x '*.Po' -x '*.o' -x '*.a' -x Makefile -x Makefile.in -x 'autom4te.cache*' soundmodem-0.18-orig/newqpsk/misc.h soundmodem-0.18-modified/newqpsk/misc.h
--- soundmodem-0.18-orig/newqpsk/misc.h	2002-08-09 22:01:52.000000000 +0200
+++ soundmodem-0.18-modified/newqpsk/misc.h	2015-12-20 21:43:51.935928173 +0100
@@ -10,7 +10,7 @@
 /*
  * Hamming weight (number of bits that are ones).
  */
-extern inline unsigned int hweight32(unsigned int w) 
+inline unsigned int hweight32(unsigned int w) 
 {
 	w = (w & 0x55555555) + ((w >>  1) & 0x55555555);
 	w = (w & 0x33333333) + ((w >>  2) & 0x33333333);
@@ -20,7 +20,7 @@ extern inline unsigned int hweight32(uns
 	return w;
 }
 
-extern inline unsigned int hweight16(unsigned short w)
+inline unsigned int hweight16(unsigned short w)
 {
 	w = (w & 0x5555) + ((w >> 1) & 0x5555);
 	w = (w & 0x3333) + ((w >> 2) & 0x3333);
@@ -29,7 +29,7 @@ extern inline unsigned int hweight16(uns
 	return w;
 }
 
-extern inline unsigned int hweight8(unsigned char w)
+inline unsigned int hweight8(unsigned char w)
 {
 	w = (w & 0x55) + ((w >> 1) & 0x55);
 	w = (w & 0x33) + ((w >> 2) & 0x33);
@@ -42,7 +42,7 @@ extern inline unsigned int hweight8(unsi
 /*
  * Reverse order of bits.
  */
-extern inline unsigned int rbits32(unsigned int w)
+inline unsigned int rbits32(unsigned int w)
 {
 	w = ((w >>  1) & 0x55555555) | ((w <<  1) & 0xaaaaaaaa);
 	w = ((w >>  2) & 0x33333333) | ((w <<  2) & 0xcccccccc);
@@ -52,7 +52,7 @@ extern inline unsigned int rbits32(unsig
 	return w;
 }
 
-extern inline unsigned short rbits16(unsigned short w)
+inline unsigned short rbits16(unsigned short w)
 {
 	w = ((w >> 1) & 0x5555) | ((w << 1) & 0xaaaa);
 	w = ((w >> 2) & 0x3333) | ((w << 2) & 0xcccc);
@@ -61,7 +61,7 @@ extern inline unsigned short rbits16(uns
 	return w;
 }
 
-extern inline unsigned char rbits8(unsigned char w)
+inline unsigned char rbits8(unsigned char w)
 {
 	w = ((w >> 1) & 0x55) | ((w << 1) & 0xaa);
 	w = ((w >> 2) & 0x33) | ((w << 2) & 0xcc);
@@ -71,7 +71,7 @@ extern inline unsigned char rbits8(unsig
 
 /* ---------------------------------------------------------------------- */
 
-extern inline float avg(float average, float input, int scale)
+inline float avg(float average, float input, int scale)
 {
 	int i;
 
@@ -82,12 +82,12 @@ extern inline float avg(float average, f
 	return (average + input);
 }
 
-extern inline float avg2(float average, float input, float weight)
+inline float avg2(float average, float input, float weight)
 {
 	return input * weight + average * (1.0 - weight);
 }
 
-extern inline float phaseavg(float *data, int len)
+inline float phaseavg(float *data, int len)
 {
 	float sum = 0.0;
 	float min = M_PI;
diff -pruN -x '*.m4' -x '*.Po' -x '*.o' -x '*.a' -x Makefile -x Makefile.in -x 'autom4te.cache*' soundmodem-0.18-orig/pammodem/pammodem.c soundmodem-0.18-modified/pammodem/pammodem.c
--- soundmodem-0.18-orig/pammodem/pammodem.c	2002-08-09 22:01:52.000000000 +0200
+++ soundmodem-0.18-modified/pammodem/pammodem.c	2015-12-20 21:40:57.975036531 +0100
@@ -160,7 +160,7 @@ struct rxstate {
 	unsigned int rxptr;
 };
 
-extern inline int rxgsfir(const int16_t *buf, const int *coeff)
+inline int rxgsfir(const int16_t *buf, const int *coeff)
 {
 	unsigned int i;
 	int s;
@@ -207,7 +207,7 @@ static void rxrewindsamples(struct rxsta
 	rx->rxphase -= ph;
 }
 
-extern inline int calcsync(int *toten, int *corren, int16_t *samples)
+inline int calcsync(int *toten, int *corren, int16_t *samples)
 {
 	const int *tr = trainsyms;
 	unsigned int i;
diff -pruN -x '*.m4' -x '*.Po' -x '*.o' -x '*.a' -x Makefile -x Makefile.in -x 'autom4te.cache*' soundmodem-0.18-orig/pskmodem/pskmodem.c soundmodem-0.18-modified/pskmodem/pskmodem.c
--- soundmodem-0.18-orig/pskmodem/pskmodem.c	2002-08-09 22:01:52.000000000 +0200
+++ soundmodem-0.18-modified/pskmodem/pskmodem.c	2015-12-20 21:41:10.594173614 +0100
@@ -262,7 +262,7 @@ static void rxrotate(cplxshort_t *ptr, u
 	}
 }
 
-extern inline int calcsync(int *toten, int *corren, cplxshort_t *samples)
+inline int calcsync(int *toten, int *corren, cplxshort_t *samples)
 {
 	const cplxshort_t *tr = traincorrrotated;
 	unsigned int i;
diff -pruN -x '*.m4' -x '*.Po' -x '*.o' -x '*.a' -x Makefile -x Makefile.in -x 'autom4te.cache*' soundmodem-0.18-orig/soundcard/modem.h soundmodem-0.18-modified/soundcard/modem.h
--- soundmodem-0.18-orig/soundcard/modem.h	2003-01-02 19:40:43.000000000 +0100
+++ soundmodem-0.18-modified/soundcard/modem.h	2015-12-20 21:38:46.809612994 +0100
@@ -103,7 +103,7 @@ extern void logvprintf(unsigned int leve
 extern void logprintf(unsigned int level, const char *fmt, ...);
 extern void logerr(unsigned int level, const char *st);
 extern unsigned int log_verblevel;
-extern inline int logcheck(unsigned int vl)
+inline int logcheck(unsigned int vl)
 {
 	return vl <= log_verblevel;
 }
diff -pruN -x '*.m4' -x '*.Po' -x '*.o' -x '*.a' -x Makefile -x Makefile.in -x 'autom4te.cache*' soundmodem-0.18-orig/soundcard/simd.h soundmodem-0.18-modified/soundcard/simd.h
--- soundmodem-0.18-orig/soundcard/simd.h	2002-08-09 22:01:52.000000000 +0200
+++ soundmodem-0.18-modified/soundcard/simd.h	2015-12-20 21:40:16.981591373 +0100
@@ -54,16 +54,16 @@
 
 #if !defined(USEMMX) && !defined(USEVIS)
 
-extern inline void initsimd(int enable)
+inline void initsimd(int enable)
 {
 }
 
-extern inline int checksimd(void)
+inline int checksimd(void)
 {
 	return 0;
 }
 
-extern inline int simdfir16(const int16_t *p1, const int16_t *p2, unsigned int nr)
+inline int simdfir16(const int16_t *p1, const int16_t *p2, unsigned int nr)
 {
 	int s = 0;
 
@@ -72,7 +72,7 @@ extern inline int simdfir16(const int16_
 	return s;
 }
 
-extern inline void simdpreparefpu(void)
+inline void simdpreparefpu(void)
 {
 }
 
@@ -82,7 +82,7 @@ extern unsigned int simd_enabled;
 
 extern void initsimd(int enable);
 
-extern inline int checksimd(void)
+inline int checksimd(void)
 {
 	return simd_enabled;
 }
@@ -91,7 +91,7 @@ extern inline int checksimd(void)
 
 #define MMXCLOBBER "st", "st(1)", "st(2)", "st(3)", "st(4)", "st(5)", "st(6)", "st(7)"
 
-extern inline int simdfir16(const int16_t *p1, const int16_t *p2, unsigned int nr)
+inline int simdfir16(const int16_t *p1, const int16_t *p2, unsigned int nr)
 {
 	unsigned int i, j;
 	int s = 0;
@@ -114,7 +114,7 @@ extern inline int simdfir16(const int16_
 	return s;
 }
 
-extern inline void simdpreparefpu(void)
+inline void simdpreparefpu(void)
 {
 	if (checksimd())
 		asm volatile("emms");
@@ -122,7 +122,7 @@ extern inline void simdpreparefpu(void)
 
 #elif defined(USEVIS)
 
-/*extern inline*/static int simdfir16(const int16_t *p1, const int16_t *p2, unsigned int nr)
+/*inline*/static int simdfir16(const int16_t *p1, const int16_t *p2, unsigned int nr)
 {
 	double dsum1, dsum2, dsum3, dsum4, arg1, arg2, arg3, arg4;
 	float sum, sum1, sum2;
@@ -157,7 +157,7 @@ extern inline void simdpreparefpu(void)
 	return s;
 }
 
-extern inline void simdpreparefpu(void)
+inline void simdpreparefpu(void)
 {
 }