diff --git a/.circleci/defaults.sh b/.circleci/defaults.sh
index cdccc3ba..439c4177 100755
--- a/.circleci/defaults.sh
+++ b/.circleci/defaults.sh
@@ -40,5 +40,5 @@ mapping["boomexample"]="SUB_PROJECT=example CONFIG=DefaultBoomConfig"
 mapping["boomrocketexample"]="SUB_PROJECT=example CONFIG=DefaultBoomAndRocketConfig"
 mapping["boom"]="SUB_PROJECT=example CONFIG=SmallBoomConfig"
 mapping["rocketchip"]="SUB_PROJECT=rocketchip"
-mapping["blockdevrocketchip"]="SUB_PROJECT=example CONFIG=BlockDeviceModelRocketConfig TOP=BoomRocketTopWithBlockDevice"
+mapping["blockdevrocketchip"]="SUB_PROJECT=example CONFIG=SimBlockDeviceRocketConfig TOP=BoomRocketTopWithBlockDevice"
 mapping["hwacha"]="SUB_PROJECT=example CONFIG=HwachaL2Config GENERATOR_PACKAGE=hwacha"
diff --git a/common.mk b/common.mk
index 3c333c68..16208e82 100644
--- a/common.mk
+++ b/common.mk
@@ -68,7 +68,7 @@ $(HARNESS_SMEMS_FILE) $(HARNESS_SMEMS_FIR): $(HARNESS_SMEMS_CONF)
 # remove duplicate files in blackbox/simfiles
 ########################################################################################
 $(sim_common_files): $(sim_files) $(sim_top_blackboxes) $(sim_harness_blackboxes)
-	awk '{print $1;}' $^ | sort -u > $@
+	awk '{print $1;}' $^ | sort -u | grep -v '.*\.h' > $@
 
 #########################################################################################
 # helper rule to just make verilog files
diff --git a/generators/testchipip b/generators/testchipip
index 85db33c3..63cd0a28 160000
--- a/generators/testchipip
+++ b/generators/testchipip
@@ -1 +1 @@
-Subproject commit 85db33c398c54eba6c979f798e975ad9a29020b4
+Subproject commit 63cd0a284e1ad905d9a5d369da4ac668b3455848
diff --git a/sims/verilator/Makefile b/sims/verilator/Makefile
index 77514e20..31fc2d41 100644
--- a/sims/verilator/Makefile
+++ b/sims/verilator/Makefile
@@ -51,7 +51,7 @@ LDFLAGS := $(LDFLAGS) -L$(RISCV)/lib -Wl,-rpath,$(RISCV)/lib -L$(sim_dir) -lfesv
 VERILATOR_CC_OPTS = \
 	-O3 \
 	-CFLAGS "$(CXXFLAGS) -DTEST_HARNESS=V$(VLOG_MODEL) -DVERILATOR" \
-	-CFLAGS "-I$(build_dir) -include $(build_dir)/$(long_name).plusArgs" \
+	-CFLAGS "-I$(build_dir) -include $(build_dir)/$(long_name).plusArgs -include $(build_dir)/verilator.h" \
 	-LDFLAGS "$(LDFLAGS)"
 
 VERILATOR_NONCC_OPTS = \