diff --git a/firmware/common/tuning.c b/firmware/common/tuning.c
index 651c8bb9..6bbe4cd1 100644
--- a/firmware/common/tuning.c
+++ b/firmware/common/tuning.c
@@ -24,6 +24,7 @@
 
 #include <rffc5071.h>
 #include <max2837.h>
+#include <sgpio.h>
 
 #define FREQ_ONE_MHZ     (1000*1000)
 
diff --git a/firmware/common/xapp058/micro.c b/firmware/common/xapp058/micro.c
index 227a4824..501d1024 100644
--- a/firmware/common/xapp058/micro.c
+++ b/firmware/common/xapp058/micro.c
@@ -454,6 +454,7 @@ int xsvfInfoInit( SXsvfInfo* pXsvfInfo )
 *****************************************************************************/
 void xsvfInfoCleanup( SXsvfInfo* pXsvfInfo )
 {
+    (void)pXsvfInfo;
 }
 
 /*****************************************************************************
@@ -1559,16 +1560,18 @@ int xsvfDoXCOMMENT( SXsvfInfo* pXsvfInfo )
     {
         putchar( ' ' );
     }
-
+#endif
+    
     do
     {
         readByte( &ucText );
+#ifdef DEBUG_MODE
         if ( xsvf_iDebugLevel > 0 )
         {
             putchar( ucText ? ucText : '\n' );
         }
-    } while ( ucText );
 #endif
+    } while ( ucText );
 
     pXsvfInfo->iErrorCode   = XSVF_ERROR_NONE;
 
diff --git a/firmware/hackrf_usb/usb_api_cpld.c b/firmware/hackrf_usb/usb_api_cpld.c
index e29007c5..cc9daa0f 100644
--- a/firmware/hackrf_usb/usb_api_cpld.c
+++ b/firmware/hackrf_usb/usb_api_cpld.c
@@ -40,6 +40,8 @@ volatile bool cpld_wait = false;
 
 static void cpld_buffer_refilled(void* user_data, unsigned int length)
 {
+	(void)user_data;
+	(void)length;
 	cpld_wait = false;
 }
 
diff --git a/firmware/sgpio/sgpio_test.c b/firmware/sgpio/sgpio_test.c
index 802129db..6e391c10 100644
--- a/firmware/sgpio/sgpio_test.c
+++ b/firmware/sgpio/sgpio_test.c
@@ -30,17 +30,18 @@
 #include <max5864.h>
 #include <sgpio.h>
 
+volatile uint32_t buffer[4096];
+
 void tx_test() {
 	sgpio_set_slice_mode(false);
 	sgpio_configure(TRANSCEIVER_MODE_TX);
 
 	// LSB goes out first, samples are 0x<Q1><I1><Q0><I0>
-	volatile uint32_t buffer[] = {
-		0xda808080,
-		0xda80ff80,
-		0x26808080,
-		0x26800180,
-	};
+	buffer[0] = 0xda808080;
+	buffer[1] = 0xda80ff80;
+	buffer[2] = 0x26808080;
+	buffer[3] = 0x26800180;
+
 	uint32_t i = 0;
 
 	sgpio_cpld_stream_enable();
@@ -56,7 +57,6 @@ void rx_test() {
 	sgpio_set_slice_mode(false);
 	sgpio_configure(TRANSCEIVER_MODE_RX);
     
-    volatile uint32_t buffer[4096];
     uint32_t i = 0;
 
 	sgpio_cpld_stream_enable();