diff --git a/Makefile b/Makefile
index f57f57a08430b9699992d658d71fb682359f1cb5..61caf1e846c4ad73c814d65a23080b309cb10ab1 100644
--- a/Makefile
+++ b/Makefile
@@ -64,11 +64,13 @@ test: all
 clean:
 	rm -f build/*.so
 	rm -f build/*.mex*
+	rm -f build/lib/*.o
 	rm -f *~
 	rm -f moberg-*.spec
 	rm -f moberg-*.tar.gz
 	make -C test clean
 	for d in $(ADAPTORS) ; do make -C $$d clean ; done
+	for d in $(PLUGINS) ; do make -C $$d clean ; done
 
 build/libmoberg.so: build/lib/moberg.o
 build/libmoberg.so: build/lib/moberg_config.o
@@ -79,3 +81,9 @@ build/lib/%.o: moberg_inline.h
 build/lib/moberg.o: moberg_config.h
 build/lib/moberg.o: moberg_module.h
 build/lib/moberg.o: moberg_parser.h
+build/lib/moberg_device.o: moberg.h
+build/lib/moberg_device.o: moberg_channel.h
+build/lib/moberg_device.o: moberg_config.h
+build/lib/moberg_device.o: moberg_device.h
+build/lib/moberg_device.o: moberg_inline.h
+
diff --git a/plugins/comedi/Makefile b/plugins/comedi/Makefile
index 66f7670e930c341af04ab2ab8cb96a0d710cd81d..3473eb0886748795b77626328d72515fcb428670 100644
--- a/plugins/comedi/Makefile
+++ b/plugins/comedi/Makefile
@@ -15,6 +15,9 @@ build/%.o:      %.c Makefile | build
 build:
 	mkdir -p $@
 
+clean:
+	rm -f build/*
+
 build/comedi.c: ../../moberg.h
 build/comedi.o: ../../moberg_config.h
 build/comedi.o: ../../moberg_device.h
diff --git a/plugins/libtest/Makefile b/plugins/libtest/Makefile
index 189d37b28aef1196d6256f58fe9206ebad5a0cf4..4e0df106353b8a7d74be878ef4cdf7224a2c1dbb 100644
--- a/plugins/libtest/Makefile
+++ b/plugins/libtest/Makefile
@@ -15,4 +15,7 @@ build/%.o:      %.c Makefile | build
 build:
 	mkdir -p $@
 
+clean:
+	rm -f build/*
+
 build/libtest.o: ../../moberg_module.h
diff --git a/plugins/serial2002/Makefile b/plugins/serial2002/Makefile
index a6b40eab0a8e2bb817d8bf010bd029e6a1354311..0e448d4a7e21154da67237476219a2bef2b2969e 100644
--- a/plugins/serial2002/Makefile
+++ b/plugins/serial2002/Makefile
@@ -15,6 +15,9 @@ build/%.o:      %.c Makefile | build
 build:
 	mkdir -p $@
 
+clean:
+	rm -f build/*
+
 build/serial2002.o: ../../moberg_module.h
 build/serial2002.o: serial2002_lib.h
 build/serial2002_lib.o: serial2002_lib.h