diff --git a/hardware/common/scpi_visa.c b/hardware/common/scpi_visa.c
index 2e7e26fd..1db85d82 100644
--- a/hardware/common/scpi_visa.c
+++ b/hardware/common/scpi_visa.c
@@ -87,7 +87,7 @@ static int scpi_visa_send(void *priv, const char *command)
 {
 	struct scpi_visa *vscpi = priv;
 	gchar *terminated_command;
-	ViUInt32 written;
+	ViUInt32 written = 0;
 	int len;
 
 	terminated_command = g_strconcat(command, "\n", NULL);
diff --git a/hardware/common/scpi_vxi.c b/hardware/common/scpi_vxi.c
index 4bdb6ab9..767303b5 100644
--- a/hardware/common/scpi_vxi.c
+++ b/hardware/common/scpi_vxi.c
@@ -21,6 +21,8 @@
  */
 
 #include <rpc/rpc.h>
+#include <string.h>
+
 #include "vxi.h"
 #include "libsigrok.h"
 #include "libsigrok-internal.h"