diff --git a/boards/msb-430-common/Makefile b/boards/msb-430-common/Makefile
index 1f64a6ab76208b2ce1f3a9ba5cd656944a9c8620..afb0e3e9010882b46b72182861aaba19f6300362 100644
--- a/boards/msb-430-common/Makefile
+++ b/boards/msb-430-common/Makefile
@@ -1,4 +1,4 @@
-MODULE = board
+MODULE = msb-430-common
 
 DIRS = drivers
 
diff --git a/boards/msb-430/Makefile.include b/boards/msb-430/Makefile.include
index c42b46b0632cf43832cdc0830a21090664cb0fe3..2f65afb5d925b39cfa35e882689216bb3cd8bc5b 100644
--- a/boards/msb-430/Makefile.include
+++ b/boards/msb-430/Makefile.include
@@ -1 +1,2 @@
+USEMODULE += msb-430-common
 include $(RIOTBOARD)/msb-430-common/Makefile.include
diff --git a/boards/msb-430h/Makefile.include b/boards/msb-430h/Makefile.include
index c42b46b0632cf43832cdc0830a21090664cb0fe3..2f65afb5d925b39cfa35e882689216bb3cd8bc5b 100644
--- a/boards/msb-430h/Makefile.include
+++ b/boards/msb-430h/Makefile.include
@@ -1 +1,2 @@
+USEMODULE += msb-430-common
 include $(RIOTBOARD)/msb-430-common/Makefile.include
diff --git a/boards/qemu-i386/Makefile.include b/boards/qemu-i386/Makefile.include
index fdcbc47a76c831b0d5a9e722d182c4b297b96cbb..a3c5c1e9f6328283ef9a7bc30c5b936ba888e398 100644
--- a/boards/qemu-i386/Makefile.include
+++ b/boards/qemu-i386/Makefile.include
@@ -1,4 +1,4 @@
-include $(RIOTBOARD)/x86-multiboot-common/Makefile.include
+USEMODULE += x86-multiboot-common
 
 CFLAGS += -march=i686 -mtune=i686
 
@@ -23,3 +23,5 @@ debug-gdb: debug
 DEBUGGER_FLAGS = "x-terminal-emulator -e gdb -ex 'target remote :1234' --args $(ELFFILE)"
 
 debug:
+
+include $(RIOTBOARD)/x86-multiboot-common/Makefile.include
diff --git a/boards/wsn430-common/Makefile b/boards/wsn430-common/Makefile
index 1f64a6ab76208b2ce1f3a9ba5cd656944a9c8620..753728b865b1ee71996b1503cdf598a9ccb1dcf5 100644
--- a/boards/wsn430-common/Makefile
+++ b/boards/wsn430-common/Makefile
@@ -1,4 +1,4 @@
-MODULE = board
+MODULE = wsn430-common
 
 DIRS = drivers
 
diff --git a/boards/wsn430-v1_3b/Makefile.include b/boards/wsn430-v1_3b/Makefile.include
index 906b27f0cc9ee6dd06a04e7043ddd2df4fd4b001..be49a22db7f859fc4d5330266d12b7077f55c917 100644
--- a/boards/wsn430-v1_3b/Makefile.include
+++ b/boards/wsn430-v1_3b/Makefile.include
@@ -1 +1,2 @@
+USEMODULE += wsn430-common
 include $(RIOTBOARD)/wsn430-common/Makefile.include
diff --git a/boards/wsn430-v1_4/Makefile.include b/boards/wsn430-v1_4/Makefile.include
index 906b27f0cc9ee6dd06a04e7043ddd2df4fd4b001..be49a22db7f859fc4d5330266d12b7077f55c917 100644
--- a/boards/wsn430-v1_4/Makefile.include
+++ b/boards/wsn430-v1_4/Makefile.include
@@ -1 +1,2 @@
+USEMODULE += wsn430-common
 include $(RIOTBOARD)/wsn430-common/Makefile.include
diff --git a/boards/x86-multiboot-common/Makefile b/boards/x86-multiboot-common/Makefile
index f8fcbb53a06595771dae356338a7bf2c0673734d..d6b64fe1d5cce161f78580e1f554a4a32ac02eca 100644
--- a/boards/x86-multiboot-common/Makefile
+++ b/boards/x86-multiboot-common/Makefile
@@ -1,3 +1,3 @@
-MODULE = board
+MODULE = x86-multiboot-common
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/x86-multiboot-common/Makefile.include b/boards/x86-multiboot-common/Makefile.include
index 46cb72f8335ff62bd3f591c7df9ad05301454d3f..91f95e813debe38757402b195bd090c1a70e2428 100644
--- a/boards/x86-multiboot-common/Makefile.include
+++ b/boards/x86-multiboot-common/Makefile.include
@@ -46,7 +46,7 @@ LINKFLAGS += -m32 -nostdlib -nostdinc -nostartfiles -nodefaultlibs \
              --prefix=$(NEWLIB_BASE) \
              -Wl,-rpath,$(NEWLIB_BASE)/lib \
              -T$(RIOTBASE)/boards/x86-multiboot-common/linker.ld
-UNDEF += $(BINDIR)board/startup.o
+UNDEF += $(BINDIR)x86-multiboot-common/startup.o
 
 BASELIBS += $(NEWLIB_BASE)/lib/libc.a \
             $(NEWLIB_BASE)/lib/libm.a