diff --git a/fesvr/memif.h b/fesvr/memif.h
index fff2f55a..ebed3d72 100644
--- a/fesvr/memif.h
+++ b/fesvr/memif.h
@@ -7,7 +7,7 @@
 #include <stddef.h>
 #include <stdexcept>
 #include "byteorder.h"
-#include "cfg.h"
+#include "../riscv/cfg.h"
 
 typedef uint64_t reg_t;
 typedef int64_t sreg_t;
diff --git a/riscv/decode.h b/riscv/decode.h
index 7dfc813f..d27f682f 100644
--- a/riscv/decode.h
+++ b/riscv/decode.h
@@ -7,7 +7,7 @@
 # error spike requires a two''s-complement c++ implementation
 #endif
 
-#include "softfloat_types.h"
+#include "../softfloat/softfloat_types.h"
 #include <algorithm>
 #include <cstdint>
 #include <string.h>
diff --git a/riscv/processor.h b/riscv/processor.h
index c2da56d8..fc17167c 100644
--- a/riscv/processor.h
+++ b/riscv/processor.h
@@ -16,7 +16,7 @@
 #include "csrs.h"
 #include "isa_parser.h"
 #include "triggers.h"
-#include "memif.h"
+#include "../fesvr/memif.h"
 #include "vector_unit.h"
 
 #define N_HPMCOUNTERS 29