diff --git a/builds/RV64ACDFIMSUxCHERI_Toooba_RVFI_DII_bluesim/Makefile b/builds/RV64ACDFIMSUxCHERI_Toooba_RVFI_DII_bluesim/Makefile
index c39df8c..a539cd9 100644
--- a/builds/RV64ACDFIMSUxCHERI_Toooba_RVFI_DII_bluesim/Makefile
+++ b/builds/RV64ACDFIMSUxCHERI_Toooba_RVFI_DII_bluesim/Makefile
@@ -3,7 +3,7 @@
 # ================================================================
 # Path to RISCY-OOO sources not included in Common
 
-ALL_RISCY_DIRS = $(RISCY_HOME)/../../src_Verifier:$(RISCY_HOME)/../../src_Verifier/BSV-RVFI-DII
+EXTRA_DIRS = $(RISCY_HOME)/../../src_Verifier:$(RISCY_HOME)/../../src_Verifier/BSV-RVFI-DII
 
 # ================================================================
 
diff --git a/builds/RV64ACDFIMSUxCHERI_Toooba_RVFI_DII_verilator/Makefile b/builds/RV64ACDFIMSUxCHERI_Toooba_RVFI_DII_verilator/Makefile
index 6f776b0..fdd3b0b 100644
--- a/builds/RV64ACDFIMSUxCHERI_Toooba_RVFI_DII_verilator/Makefile
+++ b/builds/RV64ACDFIMSUxCHERI_Toooba_RVFI_DII_verilator/Makefile
@@ -3,7 +3,7 @@
 # ================================================================
 # Path to RISCY-OOO sources not included in Common
 
-ALL_RISCY_DIRS = $(RISCY_HOME)/../../src_Verifier:$(RISCY_HOME)/../../src_Verifier/BSV-RVFI-DII
+EXTRA_DIRS = $(RISCY_HOME)/../../src_Verifier:$(RISCY_HOME)/../../src_Verifier/BSV-RVFI-DII
 
 # ================================================================
 
diff --git a/builds/Resources/Include_Common.mk b/builds/Resources/Include_Common.mk
index 119c40a..66361fc 100644
--- a/builds/Resources/Include_Common.mk
+++ b/builds/Resources/Include_Common.mk
@@ -45,7 +45,7 @@ CONNECTAL_DIRS = $(RISCY_HOME)/connectal/bsv:$(RISCY_HOME)/connectal/tests/spi:$
 CHERI_DIRS = $(RISCY_HOME)/../../libs/cheri-cap-lib
 
 # ALL_RISCY_DIRS = $(RISCY_DIRS)
-ALL_RISCY_DIRS +=$(RISCY_DIRS):$(CONNECTAL_DIRS):$(CHERI_DIRS)
+ALL_RISCY_DIRS = $(EXTRA_DIRS):$(RISCY_DIRS):$(CONNECTAL_DIRS):$(CHERI_DIRS)
 
 # ================================================================
 # Search path for bsc for .bsv files