diff --git a/cpu/mips_pic32_common/Makefile.include b/cpu/mips_pic32_common/Makefile.include
index 0591d552262e..7d26555c6731 100644
--- a/cpu/mips_pic32_common/Makefile.include
+++ b/cpu/mips_pic32_common/Makefile.include
@@ -1,3 +1,5 @@
+include $(RIOTCPU)/mips32r2_common/Makefile.include
+
 export INCLUDES += -I$(RIOTCPU)/mips_pic32_common/include
 
 USEMODULE += mips_pic32_common
diff --git a/cpu/mips_pic32mx/Makefile.features b/cpu/mips_pic32mx/Makefile.features
index 90c8bc965282..910d9743f4c6 100644
--- a/cpu/mips_pic32mx/Makefile.features
+++ b/cpu/mips_pic32mx/Makefile.features
@@ -1,2 +1 @@
 -include $(RIOTCPU)/mips_pic32_common/Makefile.features
--include $(RIOTCPU)/mips32r2_common/Makefile.features
diff --git a/cpu/mips_pic32mx/Makefile.include b/cpu/mips_pic32mx/Makefile.include
index 9c168b18cf14..d71b7bf020e8 100644
--- a/cpu/mips_pic32mx/Makefile.include
+++ b/cpu/mips_pic32mx/Makefile.include
@@ -1,8 +1,7 @@
 export ROMABLE = 1
 
-include $(RIOTMAKE)/arch/mips.inc.mk
 include $(RIOTCPU)/mips_pic32_common/Makefile.include
-include $(RIOTCPU)/mips32r2_common/Makefile.include
+include $(RIOTMAKE)/arch/mips.inc.mk
 
 # define build specific options
 export CFLAGS += -march=m4k -DSKIP_COPY_TO_RAM
diff --git a/cpu/mips_pic32mz/Makefile.features b/cpu/mips_pic32mz/Makefile.features
index 41188a2fc718..2965cb834e2b 100644
--- a/cpu/mips_pic32mz/Makefile.features
+++ b/cpu/mips_pic32mz/Makefile.features
@@ -1,4 +1,3 @@
 FEATURES_PROVIDED += periph_hwrng
 
 -include $(RIOTCPU)/mips_pic32_common/Makefile.features
--include $(RIOTCPU)/mips32r2_common/Makefile.features
diff --git a/cpu/mips_pic32mz/Makefile.include b/cpu/mips_pic32mz/Makefile.include
index 5df4e2e0df26..1ef2f66d7118 100644
--- a/cpu/mips_pic32mz/Makefile.include
+++ b/cpu/mips_pic32mz/Makefile.include
@@ -1,8 +1,7 @@
 export ROMABLE = 1
 
-include $(RIOTMAKE)/arch/mips.inc.mk
 include $(RIOTCPU)/mips_pic32_common/Makefile.include
-include $(RIOTCPU)/mips32r2_common/Makefile.include
+include $(RIOTMAKE)/arch/mips.inc.mk
 
 # define build specific options
 export CFLAGS += -march=m5101 -mmicromips -DSKIP_COPY_TO_RAM