diff --git a/boards/arduino-mkrwan1300/Makefile.include b/boards/arduino-mkrwan1300/Makefile.include
index d82a28871f1f..ab074eb66e02 100644
--- a/boards/arduino-mkrwan1300/Makefile.include
+++ b/boards/arduino-mkrwan1300/Makefile.include
@@ -7,4 +7,4 @@ endif
 include $(RIOTBOARD)/common/arduino-mkr/Makefile.include
 
 # add arduino-mkrwan1300 include path
-INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
+INCLUDES += -I$(RIOTBOARD)/arduino-mkrwan1300/include
diff --git a/boards/cc2538dk/Makefile.include b/boards/cc2538dk/Makefile.include
index 008f5863f992..468d59630131 100644
--- a/boards/cc2538dk/Makefile.include
+++ b/boards/cc2538dk/Makefile.include
@@ -11,9 +11,9 @@ include $(RIOTMAKE)/tools/serial.inc.mk
 include $(RIOTMAKE)/tools/renode.inc.mk
 
 # debugger config
-DEBUGGER = $(RIOTBOARD)/$(BOARD)/dist/debug.sh
+DEBUGGER = $(RIOTBOARD)/cc2538dk/dist/debug.sh
 DEBUGSERVER = JLinkGDBServer -device CC2538SF53
-RESET ?= $(RIOTBOARD)/$(BOARD)/dist/reset.sh
+RESET ?= $(RIOTBOARD)/cc2538dk/dist/reset.sh
 
 # Define the flash-tool and default port:
 PROGRAMMER ?= cc2538-bsl
@@ -22,7 +22,7 @@ ifeq ($(PROGRAMMER),cc2538-bsl)
   FLASHER = $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py
   FFLAGS  = -p "$(PROG_DEV)" -e -w -v $(FLASHFILE)
 else ifeq ($(PROGRAMMER),jlink)
-  FLASHER = $(RIOTBOARD)/$(BOARD)/dist/flash.sh
+  FLASHER = $(RIOTBOARD)/cc2538dk/dist/flash.sh
   FFLAGS  = $(BINDIR) $(FLASHFILE)
 endif
 
diff --git a/boards/chronos/Makefile.include b/boards/chronos/Makefile.include
index 79a72d0394c2..932f3f7be3c2 100644
--- a/boards/chronos/Makefile.include
+++ b/boards/chronos/Makefile.include
@@ -3,6 +3,6 @@ FLASHFILE ?= $(HEXFILE)
 FLASHER = mspdebug
 FFLAGS = rf2500 "prog $(FLASHFILE)"
 
-INCLUDES += -I$(RIOTBOARD)/$(BOARD)/drivers/include
+INCLUDES += -I$(RIOTBOARD)/chronos/drivers/include
 
 USEMODULE += chronos-drivers
diff --git a/boards/f4vi1/Makefile.include b/boards/f4vi1/Makefile.include
index 67c9c660c2f9..b0ab4bda6d56 100644
--- a/boards/f4vi1/Makefile.include
+++ b/boards/f4vi1/Makefile.include
@@ -10,10 +10,10 @@ include $(RIOTMAKE)/tools/serial.inc.mk
 
 # st-flash
 FLASHER = st-flash
-DEBUGGER = $(RIOTBOARD)/$(BOARD)/dist/debug.sh
+DEBUGGER = $(RIOTBOARD)/f4vi1/dist/debug.sh
 DEBUGSERVER = st-util
 
 # define st-flash parameters
 FLASHFILE ?= $(BINFILE)
 FFLAGS = write $(FLASHFILE) 0x8000000
-DEBUGGER_FLAGS = $(RIOTBOARD)/$(BOARD)/dist/gdb.conf $(ELFFILE)
+DEBUGGER_FLAGS = $(RIOTBOARD)/f4vi1/dist/gdb.conf $(ELFFILE)
diff --git a/boards/feather-m0/Makefile.include b/boards/feather-m0/Makefile.include
index bdb615db03e7..a0290f54ed3c 100644
--- a/boards/feather-m0/Makefile.include
+++ b/boards/feather-m0/Makefile.include
@@ -18,4 +18,4 @@ else
 endif
 
 # setup the boards dependencies
-include $(RIOTBOARD)/$(BOARD)/Makefile.dep
+include $(RIOTBOARD)/feather-m0/Makefile.dep
diff --git a/boards/mbed_lpc1768/Makefile.include b/boards/mbed_lpc1768/Makefile.include
index 0263880157fa..3a4374dd3b5d 100644
--- a/boards/mbed_lpc1768/Makefile.include
+++ b/boards/mbed_lpc1768/Makefile.include
@@ -1,4 +1,4 @@
-FLASHER = $(RIOTBOARD)/$(BOARD)/dist/flash.sh
+FLASHER = $(RIOTBOARD)/mbed_lpc1768/dist/flash.sh
 DEBUGGER =
 DEBUGSERVER =
 
diff --git a/boards/native/Makefile.include b/boards/native/Makefile.include
index 732bf29a5b69..0d9512d9e201 100644
--- a/boards/native/Makefile.include
+++ b/boards/native/Makefile.include
@@ -1,5 +1,5 @@
 export NATIVEINCLUDES += -DNATIVE_INCLUDES
-export NATIVEINCLUDES += -I$(RIOTBOARD)/$(BOARD)/include/
+export NATIVEINCLUDES += -I$(RIOTBOARD)/native/include/
 export NATIVEINCLUDES += -I$(RIOTBASE)/core/include/
 export NATIVEINCLUDES += -I$(RIOTBASE)/drivers/include/
 
@@ -11,7 +11,7 @@ else
   DEBUGGER ?= gdb
 endif
 
-RESET ?= $(RIOTBOARD)/$(BOARD)/dist/reset.sh
+RESET ?= $(RIOTBOARD)/native/dist/reset.sh
 FLASHER = true
 FLASHFILE ?= $(ELFFILE)
 
diff --git a/boards/opencm904/Makefile.include b/boards/opencm904/Makefile.include
index 47ce35d5f55b..ecdcf82f001e 100644
--- a/boards/opencm904/Makefile.include
+++ b/boards/opencm904/Makefile.include
@@ -5,7 +5,7 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 include $(RIOTMAKE)/tools/serial.inc.mk
 
 # custom flasher to use with the bootloader
-FLASHER = $(RIOTBOARD)/$(BOARD)/dist/robotis-loader.py
+FLASHER = $(RIOTBOARD)/opencm904/dist/robotis-loader.py
 DEBUGGER =
 DEBUGSERVER =
 
diff --git a/boards/openmote-b/Makefile.include b/boards/openmote-b/Makefile.include
index fb518d92d59c..c91db854a337 100644
--- a/boards/openmote-b/Makefile.include
+++ b/boards/openmote-b/Makefile.include
@@ -25,7 +25,7 @@ else ifeq ($(PROGRAMMER),jlink)
   export FLASH_ADDR = 0x200000
   export JLINK_DEVICE = CC2538SF53
   export JLINK_IF = JTAG
-  export JLINK_RESET_FILE = $(RIOTBOARD)/$(BOARD)/dist/hw_reset.seg
+  export JLINK_RESET_FILE = $(RIOTBOARD)/openmote-b/dist/hw_reset.seg
   include $(RIOTMAKE)/tools/jlink.inc.mk
 endif
 
diff --git a/boards/sensebox_samd21/Makefile.include b/boards/sensebox_samd21/Makefile.include
index bdb615db03e7..57f12755b9e3 100644
--- a/boards/sensebox_samd21/Makefile.include
+++ b/boards/sensebox_samd21/Makefile.include
@@ -18,4 +18,4 @@ else
 endif
 
 # setup the boards dependencies
-include $(RIOTBOARD)/$(BOARD)/Makefile.dep
+include $(RIOTBOARD)/sensebox_samd21/Makefile.dep