diff --git a/libs/spandsp/src/msvc/inttypes.h b/libs/spandsp/src/msvc/inttypes.h
index 64d8b48570..81ab70dec4 100644
--- a/libs/spandsp/src/msvc/inttypes.h
+++ b/libs/spandsp/src/msvc/inttypes.h
@@ -19,29 +19,44 @@
 extern "C" {
 #endif
 
-typedef __int8		__int8_t;
-typedef __int16		__int16_t;
-typedef __int32		__int32_t;
-typedef __int64		__int64_t;
+typedef __int8		        __int8_t;
+typedef __int16		        __int16_t;
+typedef __int32		        __int32_t;
+typedef __int64		        __int64_t;
 
 typedef unsigned __int8		uint8_t;
 typedef unsigned __int16	uint16_t;
 typedef unsigned __int32	uint32_t;
 typedef unsigned __int64    uint64_t;
-typedef __int8		int8_t;
-typedef __int16		int16_t;
-typedef __int32		int32_t;
-typedef __int64		int64_t;
-
-#define  INT16_MAX   0x7FFF 
-#define  INT16_MIN   (-INT16_MAX - 1) 
+typedef __int8		        int8_t;
+typedef __int16		        int16_t;
+typedef __int32		        int32_t;
+typedef __int64		        int64_t;
 
 #if !defined(INFINITY)
 #define INFINITY 0x7FFFFFFF
 #endif
 
+#if !defined(UINT8_MAX)
+#define UINT8_MAX   0xFF
+#endif
+#if !defined(UINT16_MAX)
+#define UINT16_MAX  0xFFFF
+#endif
+
+#if !defined(INT16_MAX)
+#define INT16_MAX   0x7FFF 
+#endif
+#if !defined(INT16_MIN)
+#define INT16_MIN   (-INT16_MAX - 1) 
+#endif
+
+#if !defined(INT32_MAX)
 #define INT32_MAX	(2147483647)
+#endif
+#if !defined(INT32_MIN)
 #define INT32_MIN	(-2147483647 - 1)
+#endif
 
 #define PRId8 "d"
 #define PRId16 "d"
diff --git a/libs/spandsp/src/sig_tone.c b/libs/spandsp/src/sig_tone.c
index 5a4de1a298..eeb50ef3ce 100644
--- a/libs/spandsp/src/sig_tone.c
+++ b/libs/spandsp/src/sig_tone.c
@@ -46,7 +46,6 @@
 #include <string.h>
 #include <limits.h>
 
-#undef SPANDSP_USE_FIXED_POINT
 #include "spandsp/telephony.h"
 #include "spandsp/fast_convert.h"
 #include "spandsp/dc_restore.h"
@@ -575,7 +574,7 @@ SPAN_DECLARE(int) sig_tone_rx(sig_tone_rx_state_t *s, int16_t amp[], int len)
         if ((s->current_rx_tone & SIG_TONE_RX_PASSTHROUGH))
         {
             if ((s->current_rx_tone & SIG_TONE_RX_FILTER_TONE)  ||  s->notch_insertion_timeout)
-                amp[i] = saturate16(notched_signal[0]);
+                amp[i] = saturate(notched_signal[0]);
             /*endif*/
         }
         else