diff --git a/src/determinist/evald.cpp b/src/determinist/evald.cpp
index b39dd1484fc9ad2c48e76802d19a96c9174fcf51..92dfbc194e96ae8512965c1323c7d17f241c62c6 100644
--- a/src/determinist/evald.cpp
+++ b/src/determinist/evald.cpp
@@ -6,11 +6,13 @@
 #include <xtensor/xarray.hpp>
 #include <xtensor/xscalar.hpp>
 
-#include "../utils.hpp"
-#include "../masks.hpp"
-#include "../maths.hpp"
-#include "../uncertainty.hpp"
-#include "evaluator.hpp"
+#include "evalhyd/evald.hpp"
+
+#include "utils.hpp"
+#include "masks.hpp"
+#include "maths.hpp"
+#include "uncertainty.hpp"
+#include "determinist/evaluator.hpp"
 
 namespace eh = evalhyd;
 
diff --git a/src/probabilist/evalp.cpp b/src/probabilist/evalp.cpp
index 71f2e3800655bb836b1c7a8aaa2be7997df719a6..ee6c64d2eea6972fb8330972fec511bf50d078da 100644
--- a/src/probabilist/evalp.cpp
+++ b/src/probabilist/evalp.cpp
@@ -7,11 +7,12 @@
 #include <xtensor/xarray.hpp>
 #include <xtensor/xview.hpp>
 
-#include "../utils.hpp"
-#include "../masks.hpp"
-#include "../maths.hpp"
-#include "../uncertainty.hpp"
-#include "evaluator.h"
+#include "evalhyd/evalp.hpp"
+#include "utils.hpp"
+#include "masks.hpp"
+#include "maths.hpp"
+#include "uncertainty.hpp"
+#include "probabilist/evaluator.hpp"
 
 namespace eh = evalhyd;
 
diff --git a/src/probabilist/evaluator.h b/src/probabilist/evaluator.hpp
similarity index 100%
rename from src/probabilist/evaluator.h
rename to src/probabilist/evaluator.hpp