diff --git a/libs/spandsp/src/fax.c b/libs/spandsp/src/fax.c
index 90409da7a4..8d8b3b25bc 100644
--- a/libs/spandsp/src/fax.c
+++ b/libs/spandsp/src/fax.c
@@ -255,7 +255,6 @@ static void fax_set_rx_type(void *user_data, int type, int bit_rate, int short_t
     {
     case T30_MODEM_V21:
         fax_modems_start_slow_modem(t, FAX_MODEM_V21_RX);
-        fax_modems_set_rx_handler(t, (span_rx_handler_t) &fsk_rx, &t->v21_rx, (span_rx_fillin_handler_t) &fsk_rx_fillin, &t->v21_rx);
         break;
     case T30_MODEM_V17:
         fax_modems_start_fast_modem(t, FAX_MODEM_V17_RX, bit_rate, short_train, use_hdlc);
@@ -286,6 +285,7 @@ static void fax_set_tx_type(void *user_data, int type, int bit_rate, int short_t
     span_log(&s->logging, SPAN_LOG_FLOW, "Set tx type %d\n", type);
     if (t->current_tx_type == type)
         return;
+
     switch (type)
     {
     case T30_MODEM_PAUSE:
diff --git a/libs/spandsp/src/make_at_dictionary.c b/libs/spandsp/src/make_at_dictionary.c
index 7f05dd9b14..3a881af992 100644
--- a/libs/spandsp/src/make_at_dictionary.c
+++ b/libs/spandsp/src/make_at_dictionary.c
@@ -24,10 +24,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#if defined(HAVE_CONFIG_H)
-#include "config.h"
-#endif
-
 #include <inttypes.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/libs/spandsp/src/make_cielab_luts.c b/libs/spandsp/src/make_cielab_luts.c
index 5fca6c7236..b143817d85 100644
--- a/libs/spandsp/src/make_cielab_luts.c
+++ b/libs/spandsp/src/make_cielab_luts.c
@@ -25,22 +25,13 @@
 
 /*! \file */
 
-#if defined(HAVE_CONFIG_H)
-#include "config.h"
-#endif
-
 #include <inttypes.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <memory.h>
-#if defined(HAVE_TGMATH_H)
-#include <tgmath.h>
-#endif
-#if defined(HAVE_MATH_H)
 #include <math.h>
-#endif
 
 typedef struct
 {
diff --git a/libs/spandsp/src/make_math_fixed_tables.c b/libs/spandsp/src/make_math_fixed_tables.c
index 64b33ca328..075cb15bd2 100644
--- a/libs/spandsp/src/make_math_fixed_tables.c
+++ b/libs/spandsp/src/make_math_fixed_tables.c
@@ -24,10 +24,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#if defined(HAVE_CONFIG_H)
-#include "config.h"
-#endif
-
 #include <inttypes.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/libs/spandsp/src/make_modem_filter.c b/libs/spandsp/src/make_modem_filter.c
index b0faed4a02..ec290c3e07 100644
--- a/libs/spandsp/src/make_modem_filter.c
+++ b/libs/spandsp/src/make_modem_filter.c
@@ -24,10 +24,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#if defined(HAVE_CONFIG_H)
-#include "config.h"
-#endif
-
 #include <inttypes.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -35,18 +31,12 @@
 #include <stdio.h>
 #include <time.h>
 #include <fcntl.h>
-#if defined(HAVE_TGMATH_H)
-#include <tgmath.h>
-#endif
-#if defined(HAVE_MATH_H)
 #include <math.h>
-#endif
 #if defined(HAVE_STDBOOL_H)
 #include <stdbool.h>
 #else
 #include "spandsp/stdbool.h"
 #endif
-#include "floating_fudge.h"
 #if defined(__sunos)  ||  defined(__solaris)  ||  defined(__sun)
 #include <getopt.h>
 #endif
diff --git a/libs/spandsp/src/make_t43_gray_code_tables.c b/libs/spandsp/src/make_t43_gray_code_tables.c
index 041b907d79..90117c5d83 100644
--- a/libs/spandsp/src/make_t43_gray_code_tables.c
+++ b/libs/spandsp/src/make_t43_gray_code_tables.c
@@ -24,10 +24,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#if defined(HAVE_CONFIG_H)
-#include "config.h"
-#endif
-
 #include <inttypes.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/libs/spandsp/tests/super_tone_tx_tests.c b/libs/spandsp/tests/super_tone_tx_tests.c
index 561b333c36..9f32ea6c78 100644
--- a/libs/spandsp/tests/super_tone_tx_tests.c
+++ b/libs/spandsp/tests/super_tone_tx_tests.c
@@ -41,7 +41,6 @@
 #include <ctype.h>
 #include <time.h>
 #include <inttypes.h>
-#include <sys/socket.h>
 #include <sndfile.h>
 
 #if defined(HAVE_LIBXML_XMLMEMORY_H)