diff --git a/extra/usb_updater/Makefile b/extra/usb_updater/Makefile
index 0a2b3a035e..f7b74a6f94 100644
--- a/extra/usb_updater/Makefile
+++ b/extra/usb_updater/Makefile
@@ -30,7 +30,7 @@ endif
 #
 LIBS    += $(shell $(PKG_CONFIG) --libs   libusb-1.0)
 CFLAGS  += $(shell $(PKG_CONFIG) --cflags libusb-1.0)
-CFLAGS  += -I../../include -I../../util
+CFLAGS  += -I../../include -I../../util -I../../test
 
 BOARD ?= cr50
 LIBS_g  = $(shell $(PKG_CONFIG) --libs   libcrypto)
diff --git a/extra/usb_updater/usb_updater.c b/extra/usb_updater/usb_updater.c
index c063198b20..669bac3b97 100644
--- a/extra/usb_updater/usb_updater.c
+++ b/extra/usb_updater/usb_updater.c
@@ -23,8 +23,7 @@
 #define __packed __attribute__((packed))
 #endif
 
-#include "config_chip.h"
-#include "board.h"
+#include "config.h"
 
 #include "compile_time_macros.h"
 #include "misc_util.h"