diff --git a/vcs.mk b/vcs.mk
index 28ed0f51..9367cca9 100644
--- a/vcs.mk
+++ b/vcs.mk
@@ -11,12 +11,6 @@ endif
 CLOCK_PERIOD ?= 1.0
 RESET_DELAY ?= 777.7
 
-VCS_CC_OPTS = \
-	-CC "-I$(RISCV)/include" \
-	-CC "-I$(dramsim_dir)" \
-	-CC "-std=c++11" \
-	-CC "$(EXTRA_SIM_CC_FLAGS)"
-
 #----------------------------------------------------------------------------------------
 # gcc configuration/optimization
 #----------------------------------------------------------------------------------------
diff --git a/vlsi/hammer b/vlsi/hammer
index cbc907df..56739c32 160000
--- a/vlsi/hammer
+++ b/vlsi/hammer
@@ -1 +1 @@
-Subproject commit cbc907dfe8005a8d72f1b2fb7b414ad9dbfe14b1
+Subproject commit 56739c32a81c82bdb065613cc3aa878f1ca40d4c
diff --git a/vlsi/hammer-synopsys-plugins b/vlsi/hammer-synopsys-plugins
index e5ec0da8..bd0e5c90 160000
--- a/vlsi/hammer-synopsys-plugins
+++ b/vlsi/hammer-synopsys-plugins
@@ -1 +1 @@
-Subproject commit e5ec0da8ad471b075de62989001b282e537416d0
+Subproject commit bd0e5c90126cb517928082517cf9af24ec27bfbb