diff --git a/src/developer_opts.c b/src/developer_opts.c
index 4f8ea8ff..ebfbcc61 100644
--- a/src/developer_opts.c
+++ b/src/developer_opts.c
@@ -50,6 +50,7 @@
 
 #include "developer_opts.h"
 #include "developer_opts_private.h"
+#include "usbdevs.h"
 
 // Inject part parameters into a semi-automated rewrite of avrdude.conf
 //  - Add entries to the tables below; they get written on -p*/si or -c*/si
diff --git a/src/libavrdude.h b/src/libavrdude.h
index 476f5dab..66ca63b4 100644
--- a/src/libavrdude.h
+++ b/src/libavrdude.h
@@ -1844,7 +1844,7 @@ typedef struct {
   Dis_symbol *dis_symbols;
 
   // Static variables from usb_libusb.c
-#include "usbdevs.h"
+#define USBDEV_MAX_XFER_3         912 // Trust compiler complains if usbdevs.h redefines this
   char usb_buf[USBDEV_MAX_XFER_3];
   int usb_buflen, usb_bufptr;   // @@@ Check whether usb_buflen needs initialising with -1
   int usb_interface;