Parts of https://github.com/flashrom/flashrom/commit/afc3ad64300bbcc14266e645beec897ef06df13d

diff --git a/dediprog.c b/dediprog.c
index 8029b64f4..5af1eec66 100644
--- a/dediprog.c
+++ b/dediprog.c
@@ -43,7 +43,7 @@
 #define REQTYPE_OTHER_IN (LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_OTHER)	/* 0xC3 */
 #define REQTYPE_EP_OUT (LIBUSB_ENDPOINT_OUT | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_ENDPOINT)	/* 0x42 */
 #define REQTYPE_EP_IN (LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_ENDPOINT)	/* 0xC2 */
-struct libusb_context *usb_ctx;
+static struct libusb_context *usb_ctx;
 static libusb_device_handle *dediprog_handle;
 static int dediprog_in_endpoint;
 static int dediprog_out_endpoint;
diff --git a/developerbox_spi.c b/developerbox_spi.c
index c80a79449..4ff2fb609 100644
--- a/developerbox_spi.c
+++ b/developerbox_spi.c
@@ -60,7 +60,7 @@ const struct dev_entry devs_developerbox_spi[] = {
 	{0},
 };
 
-struct libusb_context *usb_ctx;
+static struct libusb_context *usb_ctx;
 static libusb_device_handle *cp210x_handle;
 
 static int cp210x_gpio_get(void)