diff --git a/boards/b-l072z-lrwan1/Makefile.include b/boards/b-l072z-lrwan1/Makefile.include
index 8d969c97d0..f00504161d 100644
--- a/boards/b-l072z-lrwan1/Makefile.include
+++ b/boards/b-l072z-lrwan1/Makefile.include
@@ -5,9 +5,6 @@ INCLUDES += -I$(RIOTBOARD)/common/stm32/include
 PORT_LINUX ?= /dev/ttyACM0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # this board has an on-board ST-link adapter
 PROGRAMMER ?= openocd
 DEBUG_ADAPTER ?= stlink
diff --git a/boards/b-l475e-iot01a/Makefile.include b/boards/b-l475e-iot01a/Makefile.include
index ff1e406f4b..bff5fddfda 100644
--- a/boards/b-l475e-iot01a/Makefile.include
+++ b/boards/b-l475e-iot01a/Makefile.include
@@ -5,9 +5,6 @@ INCLUDES += -I$(RIOTBOARD)/common/stm32/include
 PORT_LINUX ?= /dev/ttyACM0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # this board has an on-board ST-link adapter
 PROGRAMMER ?= openocd
 DEBUG_ADAPTER ?= stlink
diff --git a/boards/cc1312-launchpad/Makefile.include b/boards/cc1312-launchpad/Makefile.include
index 0cd6ab1b4b..ca489d3c94 100644
--- a/boards/cc1312-launchpad/Makefile.include
+++ b/boards/cc1312-launchpad/Makefile.include
@@ -4,8 +4,5 @@ XDEBUGGER = XDS110
 PORT_LINUX  ?= /dev/ttyACM0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # configure the flash tool
 include $(RIOTBOARD)/common/cc26x2_cc13x2/Makefile.include
diff --git a/boards/cc1352-launchpad/Makefile.include b/boards/cc1352-launchpad/Makefile.include
index 0cd6ab1b4b..ca489d3c94 100644
--- a/boards/cc1352-launchpad/Makefile.include
+++ b/boards/cc1352-launchpad/Makefile.include
@@ -4,8 +4,5 @@ XDEBUGGER = XDS110
 PORT_LINUX  ?= /dev/ttyACM0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # configure the flash tool
 include $(RIOTBOARD)/common/cc26x2_cc13x2/Makefile.include
diff --git a/boards/cc1352p-launchpad/Makefile.include b/boards/cc1352p-launchpad/Makefile.include
index 0cd6ab1b4b..ca489d3c94 100644
--- a/boards/cc1352p-launchpad/Makefile.include
+++ b/boards/cc1352p-launchpad/Makefile.include
@@ -4,8 +4,5 @@ XDEBUGGER = XDS110
 PORT_LINUX  ?= /dev/ttyACM0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # configure the flash tool
 include $(RIOTBOARD)/common/cc26x2_cc13x2/Makefile.include
diff --git a/boards/cc2650-launchpad/Makefile.include b/boards/cc2650-launchpad/Makefile.include
index 2bd3fbe729..237a42bbba 100644
--- a/boards/cc2650-launchpad/Makefile.include
+++ b/boards/cc2650-launchpad/Makefile.include
@@ -4,8 +4,5 @@ XDEBUGGER = XDS110
 PORT_LINUX  ?= /dev/ttyACM0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # configure the flash tool
 PROGRAMMER ?= uniflash
diff --git a/boards/cc2650stk/Makefile.include b/boards/cc2650stk/Makefile.include
index 8630b815da..313e12aa33 100644
--- a/boards/cc2650stk/Makefile.include
+++ b/boards/cc2650stk/Makefile.include
@@ -4,8 +4,5 @@ XDEBUGGER = XDS110
 PORT_LINUX  ?= /dev/ttyACM0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # configure the flash tool
 PROGRAMMER ?= uniflash
diff --git a/boards/common/arduino-due/Makefile.include b/boards/common/arduino-due/Makefile.include
index 97858d1120..d57f8dcaf9 100644
--- a/boards/common/arduino-due/Makefile.include
+++ b/boards/common/arduino-due/Makefile.include
@@ -5,9 +5,6 @@ INCLUDES  += -I$(RIOTBOARD)/common/arduino-due/include
 PORT_LINUX ?= /dev/ttyACM0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # setup flasher (using BOSSA)
 PROGRAMMER ?= bossa
 BOSSA_VERSION = 1.8
diff --git a/boards/common/arduino-mkr/Makefile.include b/boards/common/arduino-mkr/Makefile.include
index b49f864d0a..0153b0a0b5 100644
--- a/boards/common/arduino-mkr/Makefile.include
+++ b/boards/common/arduino-mkr/Makefile.include
@@ -1,9 +1,6 @@
 PORT_LINUX ?= /dev/ttyACM0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # setup the flash tool used
 ifeq ($(PROGRAMMER),jlink)
   # in case J-Link is attached to SWD pins, use a plain CPU memory model
diff --git a/boards/common/atmega/Makefile.include b/boards/common/atmega/Makefile.include
index 787380fdee..f78604ce08 100644
--- a/boards/common/atmega/Makefile.include
+++ b/boards/common/atmega/Makefile.include
@@ -51,5 +51,3 @@ endif
 
 BOOTLOADER_SIZE ?= 0
 ROM_RESERVED ?= $(BOOTLOADER_SIZE)
-
-include $(RIOTMAKE)/tools/serial.inc.mk
diff --git a/boards/common/cc2538/Makefile.include b/boards/common/cc2538/Makefile.include
index 9912ac002c..3b8a7aea60 100644
--- a/boards/common/cc2538/Makefile.include
+++ b/boards/common/cc2538/Makefile.include
@@ -1,9 +1,6 @@
 # define the default flash-tool
 PROGRAMMER ?= cc2538-bsl
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # For backward compatibility
 ifneq (,$(PORT_BSL))
   $(warning Warning! PORT_BSL is deprecated use PROG_DEV)
diff --git a/boards/common/esp32/Makefile.include b/boards/common/esp32/Makefile.include
index eb3ee32bb0..cc6b3af004 100644
--- a/boards/common/esp32/Makefile.include
+++ b/boards/common/esp32/Makefile.include
@@ -1,4 +1,3 @@
 # configure the serial interface
 PORT_LINUX ?= /dev/ttyUSB0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
-include $(RIOTMAKE)/tools/serial.inc.mk
diff --git a/boards/common/esp8266/Makefile.include b/boards/common/esp8266/Makefile.include
index eb3ee32bb0..cc6b3af004 100644
--- a/boards/common/esp8266/Makefile.include
+++ b/boards/common/esp8266/Makefile.include
@@ -1,4 +1,3 @@
 # configure the serial interface
 PORT_LINUX ?= /dev/ttyUSB0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
-include $(RIOTMAKE)/tools/serial.inc.mk
diff --git a/boards/common/iotlab/Makefile.include b/boards/common/iotlab/Makefile.include
index 2fdb86424a..8b926b5e73 100644
--- a/boards/common/iotlab/Makefile.include
+++ b/boards/common/iotlab/Makefile.include
@@ -4,7 +4,6 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbserial*B)))
 
 # setup serial terminal
 BAUD ?= 500000
-include $(RIOTMAKE)/tools/serial.inc.mk
 
 # Use openocd by default
 PROGRAMMER ?= openocd
diff --git a/boards/common/msb-430/Makefile.include b/boards/common/msb-430/Makefile.include
index b2b4e3f1b2..dc43ef76b4 100644
--- a/boards/common/msb-430/Makefile.include
+++ b/boards/common/msb-430/Makefile.include
@@ -3,8 +3,6 @@ INCLUDES += -I$(RIOTBOARD)/common/msb-430/include
 # set default port depending on operating system
 PORT_LINUX ?= /dev/ttyUSB0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
 
 # setup flash tool
 PROGRAMMER ?= mspdebug
diff --git a/boards/common/msba2/Makefile.include b/boards/common/msba2/Makefile.include
index 341d2dd5a2..4f727bcb16 100644
--- a/boards/common/msba2/Makefile.include
+++ b/boards/common/msba2/Makefile.include
@@ -10,4 +10,3 @@ PROGRAMMER ?= lpc2k_pgm
 MINITERMFLAGS += --rts 0 --dtr 0
 
 PYTERMFLAGS += -tg
-include $(RIOTMAKE)/tools/serial.inc.mk
diff --git a/boards/common/nrf51/Makefile.include b/boards/common/nrf51/Makefile.include
index 5683775b2c..5d6291a0ec 100644
--- a/boards/common/nrf51/Makefile.include
+++ b/boards/common/nrf51/Makefile.include
@@ -1,6 +1,3 @@
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # include common nrf51 headers
 INCLUDES += -I$(RIOTBOARD)/common/nrf51/include
 
diff --git a/boards/common/nrf52/Makefile.include b/boards/common/nrf52/Makefile.include
index 589b9534d9..206f6689ec 100644
--- a/boards/common/nrf52/Makefile.include
+++ b/boards/common/nrf52/Makefile.include
@@ -12,9 +12,6 @@ else
   PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 endif
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 PROGRAMMER ?= jlink
 ifeq (jlink,$(PROGRAMMER))
   # setup JLink for flashing
diff --git a/boards/common/slwstk6000b/Makefile.include b/boards/common/slwstk6000b/Makefile.include
index 86336ec983..2fb40f8047 100644
--- a/boards/common/slwstk6000b/Makefile.include
+++ b/boards/common/slwstk6000b/Makefile.include
@@ -6,9 +6,6 @@ INCLUDES += -I$(RIOTBOARD)/common/slwstk6000b/modules/$(BOARD_MODULE)/include
 PORT_LINUX ?= /dev/ttyACM0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # setup JLink for flashing
 include $(RIOTBOARD)/common/slwstk6000b/slwstk6000b.info.mk
 JLINK_DEVICE = $(word 2, $(SLWSTK6000B_MAINBOARD_VARS_$(BOARD_MODULE)))
diff --git a/boards/common/sodaq/Makefile.include b/boards/common/sodaq/Makefile.include
index 116cd8b3e4..9375eea379 100644
--- a/boards/common/sodaq/Makefile.include
+++ b/boards/common/sodaq/Makefile.include
@@ -1,9 +1,6 @@
 PORT_LINUX ?= /dev/ttyACM0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # Add board common includes
 INCLUDES += -I$(RIOTBOARD)/common/sodaq/include
 
diff --git a/boards/e180-zg120b-tb/Makefile.include b/boards/e180-zg120b-tb/Makefile.include
index b2132d8857..307862f183 100644
--- a/boards/e180-zg120b-tb/Makefile.include
+++ b/boards/e180-zg120b-tb/Makefile.include
@@ -2,9 +2,6 @@
 PORT_LINUX ?= /dev/ttyUSB0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # setup JLink for flashing
 JLINK_DEVICE = EFR32MG1BxxxF256
 JLINK_PRE_FLASH = r
diff --git a/boards/ek-lm4f120xl/Makefile.include b/boards/ek-lm4f120xl/Makefile.include
index be82c7a358..dff930825e 100644
--- a/boards/ek-lm4f120xl/Makefile.include
+++ b/boards/ek-lm4f120xl/Makefile.include
@@ -2,8 +2,5 @@
 PORT_LINUX ?= /dev/ttyACM0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # this board uses openocd
 PROGRAMMER ?= openocd
diff --git a/boards/f4vi1/Makefile.include b/boards/f4vi1/Makefile.include
index b0ab4bda6d..03f89fc9e0 100644
--- a/boards/f4vi1/Makefile.include
+++ b/boards/f4vi1/Makefile.include
@@ -5,9 +5,6 @@ INCLUDES += -I$(RIOTBOARD)/common/stm32/include
 PORT_LINUX ?= /dev/ttyUSB0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # st-flash
 FLASHER = st-flash
 DEBUGGER = $(RIOTBOARD)/f4vi1/dist/debug.sh
diff --git a/boards/feather-m0/Makefile.include b/boards/feather-m0/Makefile.include
index e7db298a16..85ecfd8630 100644
--- a/boards/feather-m0/Makefile.include
+++ b/boards/feather-m0/Makefile.include
@@ -1,9 +1,6 @@
 PORT_LINUX ?= /dev/ttyACM0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # setup the flash tool used
 ifeq ($(PROGRAMMER),jlink)
   # in case J-Link is attached to SWD pins, use a plain CPU memory model
diff --git a/boards/feather-nrf52840/Makefile.include b/boards/feather-nrf52840/Makefile.include
index b5dda653a1..d5f8440b24 100644
--- a/boards/feather-nrf52840/Makefile.include
+++ b/boards/feather-nrf52840/Makefile.include
@@ -5,6 +5,4 @@ ifeq (,$(filter stdio_%,$(DISABLE_MODULE) $(USEMODULE)))
   RIOT_TERMINAL ?= jlink
 endif
 
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 include $(RIOTBOARD)/common/nrf52/Makefile.include
diff --git a/boards/fox/Makefile.include b/boards/fox/Makefile.include
index 46c2c5416f..306b36fe73 100644
--- a/boards/fox/Makefile.include
+++ b/boards/fox/Makefile.include
@@ -5,8 +5,5 @@ INCLUDES += -I$(RIOTBOARD)/common/stm32/include
 PORT_LINUX ?= /dev/ttyUSB1
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbserial*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # this board uses openocd
 PROGRAMMER ?= openocd
diff --git a/boards/hamilton/Makefile.include b/boards/hamilton/Makefile.include
index ad8fc56635..3dcd71e1c3 100644
--- a/boards/hamilton/Makefile.include
+++ b/boards/hamilton/Makefile.include
@@ -6,4 +6,3 @@ OFLAGS := --gap-fill 0xff
 
 # use JLink Segger RTT by default
 RIOT_TERMINAL ?= jlink
-include $(RIOTMAKE)/tools/serial.inc.mk
diff --git a/boards/hifive1/Makefile.include b/boards/hifive1/Makefile.include
index aeae4d2381..41ff60da34 100644
--- a/boards/hifive1/Makefile.include
+++ b/boards/hifive1/Makefile.include
@@ -2,9 +2,6 @@
 PORT_LINUX ?= /dev/ttyUSB1
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # this board uses openocd with a custom reset command
 PROGRAMMER ?= openocd
 OPENOCD_CMD_RESET_RUN =-c _reset
diff --git a/boards/hifive1b/Makefile.include b/boards/hifive1b/Makefile.include
index 90bd58f550..e0845372b0 100644
--- a/boards/hifive1b/Makefile.include
+++ b/boards/hifive1b/Makefile.include
@@ -2,9 +2,6 @@
 PORT_LINUX ?= /dev/ttyACM0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # Set default programmer as jlink
 PROGRAMMER ?= jlink
 
diff --git a/boards/i-nucleo-lrwan1/Makefile.include b/boards/i-nucleo-lrwan1/Makefile.include
index 776a82e3a8..2f70135b8b 100644
--- a/boards/i-nucleo-lrwan1/Makefile.include
+++ b/boards/i-nucleo-lrwan1/Makefile.include
@@ -5,9 +5,6 @@ INCLUDES += -I$(RIOTBOARD)/common/stm32/include
 PORT_LINUX ?= /dev/ttyACM0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # to flash this board, use an ST-link adapter
 DEBUG_ADAPTER ?= stlink
 
diff --git a/boards/ikea-tradfri/Makefile.include b/boards/ikea-tradfri/Makefile.include
index 2d2ef99118..08594d404a 100644
--- a/boards/ikea-tradfri/Makefile.include
+++ b/boards/ikea-tradfri/Makefile.include
@@ -6,6 +6,3 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 PROGRAMMER ?= jlink
 JLINK_DEVICE = EFR32MG1PxxxF256
 JLINK_PRE_FLASH = r
-
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
diff --git a/boards/im880b/Makefile.include b/boards/im880b/Makefile.include
index ce909e3c16..0f505073ce 100644
--- a/boards/im880b/Makefile.include
+++ b/boards/im880b/Makefile.include
@@ -5,9 +5,6 @@ INCLUDES += -I$(RIOTBOARD)/common/stm32/include
 PORT_LINUX ?= /dev/ttyUSB0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 CFLAGS+=-DSX127X_TX_SWITCH
 CFLAGS+=-DSX127X_RX_SWITCH
 
diff --git a/boards/limifrog-v1/Makefile.include b/boards/limifrog-v1/Makefile.include
index 0db09eac69..eaa41ac9b2 100644
--- a/boards/limifrog-v1/Makefile.include
+++ b/boards/limifrog-v1/Makefile.include
@@ -5,9 +5,6 @@ INCLUDES += -I$(RIOTBOARD)/common/stm32/include
 PORT_LINUX ?= /dev/ttyUSB0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # this board uses openocd with st-link
 PROGRAMMER ?= openocd
 DEBUG_ADAPTER ?= stlink
diff --git a/boards/lobaro-lorabox/Makefile.include b/boards/lobaro-lorabox/Makefile.include
index 3ac4636512..f13abe9e72 100644
--- a/boards/lobaro-lorabox/Makefile.include
+++ b/boards/lobaro-lorabox/Makefile.include
@@ -5,9 +5,6 @@ INCLUDES += -I$(RIOTBOARD)/common/stm32/include
 PORT_LINUX ?= /dev/ttyUSB0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # Configure programmer
 PROGRAMMER ?= stm32loader
 
diff --git a/boards/lsn50/Makefile.include b/boards/lsn50/Makefile.include
index 3a74588123..0b15e443f4 100644
--- a/boards/lsn50/Makefile.include
+++ b/boards/lsn50/Makefile.include
@@ -5,9 +5,6 @@ INCLUDES += -I$(RIOTBOARD)/common/stm32/include
 PORT_LINUX ?= /dev/ttyACM0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # this board uses openocd
 PROGRAMMER ?= openocd
 # this board can become un-flashable after a hardfault,
diff --git a/boards/maple-mini/Makefile.include b/boards/maple-mini/Makefile.include
index 93dcf09dd9..b67fcbdb6e 100644
--- a/boards/maple-mini/Makefile.include
+++ b/boards/maple-mini/Makefile.include
@@ -5,9 +5,6 @@ INCLUDES += -I$(RIOTBOARD)/common/stm32/include
 PORT_LINUX ?= /dev/ttyACM0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # this board uses openocd with st-link
 PROGRAMMER ?= openocd
 DEBUG_ADAPTER ?= stlink
diff --git a/boards/mbed_lpc1768/Makefile.include b/boards/mbed_lpc1768/Makefile.include
index 3a4374dd3b..9cb3529458 100644
--- a/boards/mbed_lpc1768/Makefile.include
+++ b/boards/mbed_lpc1768/Makefile.include
@@ -9,6 +9,3 @@ DEBUGGER_FLAGS =
 # define the default port depending on the host OS
 PORT_LINUX ?= /dev/ttyACM0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
-
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
diff --git a/boards/mulle/Makefile.include b/boards/mulle/Makefile.include
index 8438f2acf8..0859af56b1 100644
--- a/boards/mulle/Makefile.include
+++ b/boards/mulle/Makefile.include
@@ -24,6 +24,3 @@ DEBUG_ADAPTER_ID ?= $(PROGRAMMER_SERIAL)
 # Define the default port depending on the host OS
 PORT_LINUX ?= /dev/ttyUSB0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbserial*)))
-
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
diff --git a/boards/nz32-sc151/Makefile.include b/boards/nz32-sc151/Makefile.include
index 289abdad49..292f974106 100644
--- a/boards/nz32-sc151/Makefile.include
+++ b/boards/nz32-sc151/Makefile.include
@@ -8,6 +8,3 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
 # this board is flashed using DFU
 PROGRAMMER ?= dfu-util
 DFU_USB_ID = 0483:df11
-
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
diff --git a/boards/opencm904/Makefile.include b/boards/opencm904/Makefile.include
index 1cc07cc335..b779e70df9 100644
--- a/boards/opencm904/Makefile.include
+++ b/boards/opencm904/Makefile.include
@@ -4,8 +4,6 @@ INCLUDES += -I$(RIOTBOARD)/common/stm32/include
 # define the default port depending on the host OS
 PORT_LINUX ?= /dev/ttyACM0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
 
 # custom flasher to use with the bootloader
 PROGRAMMER ?= robotis-loader
diff --git a/boards/p-l496g-cell02/Makefile.include b/boards/p-l496g-cell02/Makefile.include
index ca0735a915..dc5d54cf77 100644
--- a/boards/p-l496g-cell02/Makefile.include
+++ b/boards/p-l496g-cell02/Makefile.include
@@ -5,9 +5,6 @@ INCLUDES += -I$(RIOTBOARD)/common/stm32/include
 PORT_LINUX ?= /dev/ttyACM0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # this board uses openocd with st-link
 PROGRAMMER ?= openocd
 DEBUG_ADAPTER ?= stlink
diff --git a/boards/pba-d-01-kw2x/Makefile.include b/boards/pba-d-01-kw2x/Makefile.include
index 9a80abc5d0..2cc502a7aa 100644
--- a/boards/pba-d-01-kw2x/Makefile.include
+++ b/boards/pba-d-01-kw2x/Makefile.include
@@ -15,9 +15,6 @@ ifneq (,$(SERIAL))
   PORT_LINUX := $(SERIAL_TTY)
 endif
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # this board uses openocd
 PROGRAMMER ?= openocd
 
diff --git a/boards/pic32-wifire/Makefile.include b/boards/pic32-wifire/Makefile.include
index 62686ed9f8..bb34bd22c3 100644
--- a/boards/pic32-wifire/Makefile.include
+++ b/boards/pic32-wifire/Makefile.include
@@ -1,5 +1,4 @@
 PORT_LINUX ?= /dev/ttyUSB0
-include $(RIOTMAKE)/tools/serial.inc.mk
 
 # use pic32prog by default to program this board
 PROGRAMMER ?= pic32prog
diff --git a/boards/pinetime/Makefile.include b/boards/pinetime/Makefile.include
index 2cefa7c712..2ce2c5e203 100644
--- a/boards/pinetime/Makefile.include
+++ b/boards/pinetime/Makefile.include
@@ -1,6 +1,5 @@
 # use JLink Segger RTT by default
 RIOT_TERMINAL ?= jlink
-include $(RIOTMAKE)/tools/serial.inc.mk
 
 # define pyocd as programmer to program with stlink
 ifeq (pyocd,$(PROGRAMMER))
diff --git a/boards/pyboard/Makefile.include b/boards/pyboard/Makefile.include
index 2d32786402..90c65adba6 100644
--- a/boards/pyboard/Makefile.include
+++ b/boards/pyboard/Makefile.include
@@ -5,9 +5,6 @@ INCLUDES += -I$(RIOTBOARD)/common/stm32/include
 PORT_LINUX ?= /dev/ttyUSB0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # this board is flashed using DFU
 PROGRAMMER ?= dfu-util
 DFU_USB_ID = 1d50:607f
diff --git a/boards/ruuvitag/Makefile.include b/boards/ruuvitag/Makefile.include
index 048ba8f4f6..03e3beeae0 100644
--- a/boards/ruuvitag/Makefile.include
+++ b/boards/ruuvitag/Makefile.include
@@ -5,7 +5,5 @@ ifeq (,$(filter stdio_%,$(DISABLE_MODULE) $(USEMODULE)))
   RIOT_TERMINAL ?= jlink
 endif
 
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # use shared Makefile.include
 include $(RIOTBOARD)/common/nrf52xxxdk/Makefile.include
diff --git a/boards/seeeduino_arch-pro/Makefile.include b/boards/seeeduino_arch-pro/Makefile.include
index a2ded0a9f6..71b001bd77 100644
--- a/boards/seeeduino_arch-pro/Makefile.include
+++ b/boards/seeeduino_arch-pro/Makefile.include
@@ -2,10 +2,6 @@
 PORT_LINUX ?= /dev/ttyUSB0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
-
 # this board uses openocd with an HEXFILE
 PROGRAMMER ?= openocd
 FLASHFILE ?= $(HEXFILE)
diff --git a/boards/sensebox_samd21/Makefile.include b/boards/sensebox_samd21/Makefile.include
index 7498bd70e3..d041b35395 100644
--- a/boards/sensebox_samd21/Makefile.include
+++ b/boards/sensebox_samd21/Makefile.include
@@ -1,9 +1,6 @@
 PORT_LINUX ?= /dev/ttyACM0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # by default, we use BOSSA to flash this board to take into account the
 # pre-flashed Arduino bootloader
 PROGRAMMER ?= bossa
diff --git a/boards/slstk3401a/Makefile.include b/boards/slstk3401a/Makefile.include
index 52633b1c80..f1520e964f 100644
--- a/boards/slstk3401a/Makefile.include
+++ b/boards/slstk3401a/Makefile.include
@@ -2,9 +2,6 @@
 PORT_LINUX ?= /dev/ttyACM0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # setup JLink for flashing
 JLINK_PRE_FLASH = r
 
diff --git a/boards/slstk3402a/Makefile.include b/boards/slstk3402a/Makefile.include
index 52633b1c80..f1520e964f 100644
--- a/boards/slstk3402a/Makefile.include
+++ b/boards/slstk3402a/Makefile.include
@@ -2,9 +2,6 @@
 PORT_LINUX ?= /dev/ttyACM0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # setup JLink for flashing
 JLINK_PRE_FLASH = r
 
diff --git a/boards/sltb001a/Makefile.include b/boards/sltb001a/Makefile.include
index 49293f93e7..bbea4b21d8 100644
--- a/boards/sltb001a/Makefile.include
+++ b/boards/sltb001a/Makefile.include
@@ -2,9 +2,6 @@
 PORT_LINUX ?= /dev/ttyACM0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # setup JLink for flashing
 JLINK_DEVICE = EFR32MG1PxxxF256
 JLINK_PRE_FLASH = r
diff --git a/boards/slwstk6220a/Makefile.include b/boards/slwstk6220a/Makefile.include
index 52633b1c80..f1520e964f 100644
--- a/boards/slwstk6220a/Makefile.include
+++ b/boards/slwstk6220a/Makefile.include
@@ -2,9 +2,6 @@
 PORT_LINUX ?= /dev/ttyACM0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # setup JLink for flashing
 JLINK_PRE_FLASH = r
 
diff --git a/boards/spark-core/Makefile.include b/boards/spark-core/Makefile.include
index 5150889ad6..2af6c22969 100644
--- a/boards/spark-core/Makefile.include
+++ b/boards/spark-core/Makefile.include
@@ -5,8 +5,6 @@ INCLUDES += -I$(RIOTBOARD)/common/stm32/include
 PORT_LINUX ?= /dev/ttyUSB0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
 
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # Skip the space needed by the embedded bootloader
 ROM_OFFSET ?= 0x5000
 
diff --git a/boards/stk3200/Makefile.include b/boards/stk3200/Makefile.include
index 52633b1c80..f1520e964f 100644
--- a/boards/stk3200/Makefile.include
+++ b/boards/stk3200/Makefile.include
@@ -2,9 +2,6 @@
 PORT_LINUX ?= /dev/ttyACM0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # setup JLink for flashing
 JLINK_PRE_FLASH = r
 
diff --git a/boards/stk3600/Makefile.include b/boards/stk3600/Makefile.include
index 52633b1c80..f1520e964f 100644
--- a/boards/stk3600/Makefile.include
+++ b/boards/stk3600/Makefile.include
@@ -2,9 +2,6 @@
 PORT_LINUX ?= /dev/ttyACM0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # setup JLink for flashing
 JLINK_PRE_FLASH = r
 
diff --git a/boards/stk3700/Makefile.include b/boards/stk3700/Makefile.include
index 52633b1c80..f1520e964f 100644
--- a/boards/stk3700/Makefile.include
+++ b/boards/stk3700/Makefile.include
@@ -2,9 +2,6 @@
 PORT_LINUX ?= /dev/ttyACM0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # setup JLink for flashing
 JLINK_PRE_FLASH = r
 
diff --git a/boards/stm32f0discovery/Makefile.include b/boards/stm32f0discovery/Makefile.include
index d7b0d948fa..60c999497d 100644
--- a/boards/stm32f0discovery/Makefile.include
+++ b/boards/stm32f0discovery/Makefile.include
@@ -5,9 +5,6 @@ INCLUDES += -I$(RIOTBASE)/boards/common/stm32/include
 PORT_LINUX ?= /dev/ttyUSB0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # this board uses openocd
 PROGRAMMER ?= openocd
 DEBUG_ADAPTER ?= stlink
diff --git a/boards/stm32f3discovery/Makefile.include b/boards/stm32f3discovery/Makefile.include
index a8e44865fd..967db6d771 100644
--- a/boards/stm32f3discovery/Makefile.include
+++ b/boards/stm32f3discovery/Makefile.include
@@ -5,9 +5,6 @@ INCLUDES += -I$(RIOTBOARD)/common/stm32/include
 PORT_LINUX ?= /dev/ttyUSB0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # this board uses openocd
 PROGRAMMER ?= openocd
 DEBUG_ADAPTER ?= stlink
diff --git a/boards/stm32f429i-disc1/Makefile.include b/boards/stm32f429i-disc1/Makefile.include
index c7fcb2908e..5ee79cd551 100644
--- a/boards/stm32f429i-disc1/Makefile.include
+++ b/boards/stm32f429i-disc1/Makefile.include
@@ -5,9 +5,6 @@ INCLUDES += -I$(RIOTBOARD)/common/stm32/include
 PORT_LINUX ?= /dev/ttyACM0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # this board uses openocd
 PROGRAMMER ?= openocd
 # this board has an on-board ST-link adapter
diff --git a/boards/stm32f4discovery/Makefile.include b/boards/stm32f4discovery/Makefile.include
index cd82b7ff17..b9d86a40ac 100644
--- a/boards/stm32f4discovery/Makefile.include
+++ b/boards/stm32f4discovery/Makefile.include
@@ -5,9 +5,6 @@ INCLUDES += -I$(RIOTBOARD)/common/stm32/include
 PORT_LINUX ?= /dev/ttyUSB0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # this board uses openocd with st-link
 PROGRAMMER ?= openocd
 DEBUG_ADAPTER ?= stlink
diff --git a/boards/stm32f723e-disco/Makefile.include b/boards/stm32f723e-disco/Makefile.include
index 6f489f83ed..40d644f908 100644
--- a/boards/stm32f723e-disco/Makefile.include
+++ b/boards/stm32f723e-disco/Makefile.include
@@ -5,9 +5,6 @@ INCLUDES += -I$(RIOTBOARD)/common/stm32/include
 PORT_LINUX ?= /dev/ttyACM0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # this board uses openocd
 PROGRAMMER ?= openocd
 
diff --git a/boards/stm32f769i-disco/Makefile.include b/boards/stm32f769i-disco/Makefile.include
index 4f6e0d4dd3..8146a39d45 100644
--- a/boards/stm32f769i-disco/Makefile.include
+++ b/boards/stm32f769i-disco/Makefile.include
@@ -5,9 +5,6 @@ INCLUDES += -I$(RIOTBOARD)/common/stm32/include
 PORT_LINUX ?= /dev/ttyACM0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # this board uses openocd with st-link
 PROGRAMMER ?= openocd
 
diff --git a/boards/stm32l0538-disco/Makefile.include b/boards/stm32l0538-disco/Makefile.include
index 4c306645cc..e283275bec 100644
--- a/boards/stm32l0538-disco/Makefile.include
+++ b/boards/stm32l0538-disco/Makefile.include
@@ -5,9 +5,6 @@ INCLUDES += -I$(RIOTBOARD)/common/stm32/include
 PORT_LINUX ?= /dev/ttyUSB0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # this board uses openocd with st-link
 PROGRAMMER ?= openocd
 
diff --git a/boards/stm32l476g-disco/Makefile.include b/boards/stm32l476g-disco/Makefile.include
index ca0735a915..dc5d54cf77 100644
--- a/boards/stm32l476g-disco/Makefile.include
+++ b/boards/stm32l476g-disco/Makefile.include
@@ -5,9 +5,6 @@ INCLUDES += -I$(RIOTBOARD)/common/stm32/include
 PORT_LINUX ?= /dev/ttyACM0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # this board uses openocd with st-link
 PROGRAMMER ?= openocd
 DEBUG_ADAPTER ?= stlink
diff --git a/boards/stm32mp157c-dk2/Makefile.include b/boards/stm32mp157c-dk2/Makefile.include
index 1d55ba58e3..c9654a106b 100644
--- a/boards/stm32mp157c-dk2/Makefile.include
+++ b/boards/stm32mp157c-dk2/Makefile.include
@@ -5,9 +5,6 @@ INCLUDES += -I$(RIOTBOARD)/common/stm32/include
 PORT_LINUX ?= /dev/ttyACM0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # this board has an on-board ST-link adapter
 DEBUG_ADAPTER = stlink-dap
 OPENOCD_CORE = stm32mp15x.cm4
diff --git a/boards/teensy31/Makefile.include b/boards/teensy31/Makefile.include
index 59181d2b60..702ed04a8e 100644
--- a/boards/teensy31/Makefile.include
+++ b/boards/teensy31/Makefile.include
@@ -17,6 +17,3 @@ $(TEENSY_LOADER):
 	@echo "[INFO] teensy_loader binary not found - building it from source now"
 	CC= CFLAGS= $(MAKE) -C $(RIOTTOOLS)/teensy-loader-cli
 	@echo "[INFO] teensy_loader binary successfully build!"
-
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
diff --git a/boards/telosb/Makefile.include b/boards/telosb/Makefile.include
index d6f6a29e39..0fde013039 100644
--- a/boards/telosb/Makefile.include
+++ b/boards/telosb/Makefile.include
@@ -3,7 +3,6 @@ PORT_LINUX ?= /dev/ttyUSB0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbserial-MXV*)))
 # setup serial terminal
 BAUD ?= 9600
-include $(RIOTMAKE)/tools/serial.inc.mk
 
 # flash tool configuration
 PROGRAMMER ?= goodfet
diff --git a/boards/thingy52/Makefile.include b/boards/thingy52/Makefile.include
index c73c953414..59dbf42556 100644
--- a/boards/thingy52/Makefile.include
+++ b/boards/thingy52/Makefile.include
@@ -5,7 +5,5 @@ ifeq (,$(filter stdio_%,$(DISABLE_MODULE) $(USEMODULE)))
   RIOT_TERMINAL ?= jlink
 endif
 
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # use shared Makefile.include
 include $(RIOTBOARD)/common/nrf52/Makefile.include
diff --git a/boards/ublox-c030-u201/Makefile.include b/boards/ublox-c030-u201/Makefile.include
index a309ac1f99..49945d5f5b 100644
--- a/boards/ublox-c030-u201/Makefile.include
+++ b/boards/ublox-c030-u201/Makefile.include
@@ -5,9 +5,6 @@ INCLUDES += -I$(RIOTBOARD)/common/stm32/include
 PORT_LINUX ?= /dev/ttyACM0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # this board uses openocd with st-link
 PROGRAMMER ?= openocd
 
diff --git a/boards/z1/Makefile.include b/boards/z1/Makefile.include
index 58817a1166..c228bb5c3b 100644
--- a/boards/z1/Makefile.include
+++ b/boards/z1/Makefile.include
@@ -1,8 +1,6 @@
 # set default port depending on operating system
 PORT_LINUX ?= /dev/ttyUSB0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
 
 # setup flash tool
 PROGRAMMER ?= goodfet
diff --git a/makefiles/boards/sam0.inc.mk b/makefiles/boards/sam0.inc.mk
index debdebe33d..d49fb37221 100644
--- a/makefiles/boards/sam0.inc.mk
+++ b/makefiles/boards/sam0.inc.mk
@@ -18,9 +18,6 @@ ifneq (,$(filter debug% flash% %term test,$(MAKECMDGOALS)))
   endif
 endif
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 # Default for these boards is to use a CMSIS-DAP programmer
 DEBUG_ADAPTER ?= dap
 
diff --git a/makefiles/boards/stm32.inc.mk b/makefiles/boards/stm32.inc.mk
index 37fb545378..0b88587e5b 100644
--- a/makefiles/boards/stm32.inc.mk
+++ b/makefiles/boards/stm32.inc.mk
@@ -17,9 +17,6 @@ else
   PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 endif
 
-# setup serial terminal
-include $(RIOTMAKE)/tools/serial.inc.mk
-
 ifeq (openocd,$(PROGRAMMER))
   # STM32 boards can become un-flashable after a hardfault,
   # use connect_assert_srst to always be able to flash or reset the boards.