diff --git a/cpu/mips32r2_common/Makefile.dep b/cpu/mips32r2_common/Makefile.dep
new file mode 100644
index 0000000000..af49a8d526
--- /dev/null
+++ b/cpu/mips32r2_common/Makefile.dep
@@ -0,0 +1,14 @@
+USEMODULE += mips32r2_common
+USEMODULE += mips32r2_common_periph
+USEMODULE += newlib
+
+# mips32 needs periph_timer for its gettimeofday() implementation
+FEATURES_REQUIRED += periph_timer
+
+ifeq ($(USE_UHI_SYSCALLS),1)
+  #Use UHI to handle syscalls
+  USEMODULE += newlib_syscalls_mips_uhi
+else
+  #Use RIOT to handle syscalls (default)
+  USEMODULE += newlib_syscalls_default
+endif
diff --git a/cpu/mips32r2_common/Makefile.include b/cpu/mips32r2_common/Makefile.include
index b65543819c..5ad9e95238 100644
--- a/cpu/mips32r2_common/Makefile.include
+++ b/cpu/mips32r2_common/Makefile.include
@@ -1,18 +1,7 @@
 INCLUDES += -I$(RIOTCPU)/mips32r2_common/include
 
-export USEMODULE += mips32r2_common
-export USEMODULE += mips32r2_common_periph
-export USEMODULE += newlib
-
-# mips32 needs periph_timer for its gettimeofday() implementation
-export USEMODULE += periph_timer
-
 ifeq ($(USE_UHI_SYSCALLS),1)
   #Use UHI to handle syscalls
   LINKFLAGS += -luhi
-  export USEMODULE += newlib_syscalls_mips_uhi
   CFLAGS += -DHAVE_HEAP_STATS
-else
-  #Use RIOT to handle syscalls (default)
-  export USEMODULE += newlib_syscalls_default
 endif
diff --git a/cpu/mips_pic32_common/Makefile.dep b/cpu/mips_pic32_common/Makefile.dep
new file mode 100644
index 0000000000..f3fd6729ba
--- /dev/null
+++ b/cpu/mips_pic32_common/Makefile.dep
@@ -0,0 +1,4 @@
+USEMODULE += mips_pic32_common
+USEMODULE += mips_pic32_common_periph
+
+include $(RIOTCPU)/mips32r2_common/Makefile.dep
diff --git a/cpu/mips_pic32_common/Makefile.include b/cpu/mips_pic32_common/Makefile.include
index c7873eb984..cc5b75126a 100644
--- a/cpu/mips_pic32_common/Makefile.include
+++ b/cpu/mips_pic32_common/Makefile.include
@@ -1,6 +1,3 @@
 include $(RIOTCPU)/mips32r2_common/Makefile.include
 
 INCLUDES += -I$(RIOTCPU)/mips_pic32_common/include
-
-USEMODULE += mips_pic32_common
-USEMODULE += mips_pic32_common_periph
diff --git a/cpu/mips_pic32mx/Makefile.dep b/cpu/mips_pic32mx/Makefile.dep
new file mode 100644
index 0000000000..5d3f2106be
--- /dev/null
+++ b/cpu/mips_pic32mx/Makefile.dep
@@ -0,0 +1 @@
+include $(RIOTCPU)/mips_pic32_common/Makefile.dep
diff --git a/cpu/mips_pic32mz/Makefile.dep b/cpu/mips_pic32mz/Makefile.dep
new file mode 100644
index 0000000000..5d3f2106be
--- /dev/null
+++ b/cpu/mips_pic32mz/Makefile.dep
@@ -0,0 +1 @@
+include $(RIOTCPU)/mips_pic32_common/Makefile.dep