diff --git a/libuavcan/include.mk b/libuavcan/include.mk
index e4f420cabc..f4c01de5df 100644
--- a/libuavcan/include.mk
+++ b/libuavcan/include.mk
@@ -4,19 +4,19 @@
 
 LIBUAVCAN_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
 
-UAVCAN_DIR := $(LIBUAVCAN_DIR)/../
+UAVCAN_DIR := $(LIBUAVCAN_DIR)../
 
 #
 # Library sources
 #
-LIBUAVCAN_SRC := $(shell find $(LIBUAVCAN_DIR)/src -type f -name '*.cpp')
+LIBUAVCAN_SRC := $(shell find $(LIBUAVCAN_DIR)src -type f -name '*.cpp')
 
-LIBUAVCAN_INC := $(LIBUAVCAN_DIR)/include
+LIBUAVCAN_INC := $(LIBUAVCAN_DIR)include
 
 #
 # DSDL compiler executable
 #
-LIBUAVCAN_DSDLC := $(LIBUAVCAN_DIR)/dsdl_compiler/libuavcan_dsdlc
+LIBUAVCAN_DSDLC := $(LIBUAVCAN_DIR)dsdl_compiler/libuavcan_dsdlc
 
 #
 # Standard DSDL definitions
diff --git a/libuavcan_drivers/stm32/driver/include.mk b/libuavcan_drivers/stm32/driver/include.mk
index d52fc38b7b..b7c4ed6e49 100644
--- a/libuavcan_drivers/stm32/driver/include.mk
+++ b/libuavcan_drivers/stm32/driver/include.mk
@@ -4,6 +4,6 @@
 
 LIBUAVCAN_STM32_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
 
-LIBUAVCAN_STM32_SRC := $(shell find $(LIBUAVCAN_STM32_DIR)/src -type f -name '*.cpp')
+LIBUAVCAN_STM32_SRC := $(shell find $(LIBUAVCAN_STM32_DIR)src -type f -name '*.cpp')
 
-LIBUAVCAN_STM32_INC := $(LIBUAVCAN_STM32_DIR)/include/
+LIBUAVCAN_STM32_INC := $(LIBUAVCAN_STM32_DIR)include/