diff --git a/sim/hei_sim_main.cpp b/sim/hei_sim_main.cpp
index b3f26d2..035d003 100644
--- a/sim/hei_sim_main.cpp
+++ b/sim/hei_sim_main.cpp
@@ -1,5 +1,5 @@
 
-#include "../hei_isolator.hpp"
+#include "../src/hei_isolator.hpp"
 
 int main()
 {
diff --git a/sim/hei_user_defines.hpp b/sim/hei_trace.hpp
similarity index 100%
rename from sim/hei_user_defines.hpp
rename to sim/hei_trace.hpp
diff --git a/sim/meson.build b/sim/meson.build
index 3693e81..fe3fa32 100644
--- a/sim/meson.build
+++ b/sim/meson.build
@@ -1,7 +1,7 @@
 tests = ['openpower-libhei-sim']
 
 sim_sources = ['hei_sim_main.cpp',
-                '../hei_isolator.cpp']
+                '../src/hei_isolator.cpp']
 
 foreach t : tests
   test(t, executable(t.underscorify(), sim_sources, include_directories : incdir))