diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ TOP:=$(shell readlink -f "../..")
 DISCOVERY:=Utilities/STM32L100C-Discovery
 STMLIB:=libraries
 OLEDDRV:=oleddrv
-USBDRV:=libraries/USB
+USBDRV:=USB
 STD_PERIPH:=$(STMLIB)/STM32L1xx_StdPeriph_Driver
 STARTUP:=$(STMLIB)/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc_ride7
 LINKER_SCRIPT:=$(CURDIR)/stm32-flash.ld
@@ -21,14 +21,12 @@ INCLUDE+=-I$(STMLIB)/CMSIS/Device/ST/STM
 INCLUDE+=-I$(STD_PERIPH)/inc
 INCLUDE+=-I$(DISCOVERY)
 INCLUDE+=-I$(STMLIB)/$(OLEDDRV)
-#INCLUDE+=-I$(STMLIB)/STM32_USB_OTG_Driver/inc
-#INCLUDE+=-I$(STMLIB)/STM32_USB_Device_Library/Class/hid/inc
-#INCLUDE+=-I$(STMLIB)/STM32_USB_Device_Library/Core/inc
+INCLUDE+=-I$(STMLIB)/$(USBDRV)
 
 # vpath is used so object files are written to the current directory instead
 # of the same directory as their source files
 vpath %.c $(DISCOVERY) $(STD_PERIPH)/src \
-          $(STMLIB)/STM32_USB_OTG_Driver/src \
+          $(STMLIB)/USB \
           $(STMLIB)/STM32_USB-FS_Device_Library/Class/hid/src \
           $(STMLIB)/STM32_USB-FS_Device_Library/Core/src
 vpath %.s $(STARTUP)