diff --git a/riscv/cachesim.h b/riscv/cachesim.h
index d5dcf389..96631a0d 100644
--- a/riscv/cachesim.h
+++ b/riscv/cachesim.h
@@ -22,7 +22,7 @@ class cache_sim_t
  public:
   cache_sim_t(size_t sets, size_t ways, size_t linesz, const char* name);
   cache_sim_t(const cache_sim_t& rhs);
-  ~cache_sim_t();
+  virtual ~cache_sim_t();
 
   void access(uint64_t addr, size_t bytes, bool store);
   void print_stats();
diff --git a/riscv/decode.h b/riscv/decode.h
index 202541fb..fd3b2923 100644
--- a/riscv/decode.h
+++ b/riscv/decode.h
@@ -3,6 +3,7 @@
 
 #define __STDC_LIMIT_MACROS
 #include <stdint.h>
+#include <string.h>
 #include "pcr.h"
 #include "config.h"