diff --git a/CarpetX/interface.ccl b/CarpetX/interface.ccl
index 13a3c03d0..5c6b7dc7a 100644
--- a/CarpetX/interface.ccl
+++ b/CarpetX/interface.ccl
@@ -15,7 +15,9 @@ USES INCLUDE HEADER: loop.hxx
 USES INCLUDE HEADER: loop_device.hxx
 
 INCLUDES HEADER: driver.hxx IN driver.hxx
+INCLUDES HEADER: schedule.hxx IN schedule.hxx
 INCLUDES HEADER: reduction.hxx IN reduction.hxx
+INCLUDES HEADER: timer.hxx IN timer.hxx
 
 
 
diff --git a/ODESolvers/interface.ccl b/ODESolvers/interface.ccl
index a2576e42d..e27919472 100644
--- a/ODESolvers/interface.ccl
+++ b/ODESolvers/interface.ccl
@@ -3,6 +3,9 @@
 IMPLEMENTS: ODESolvers
 
 USES INCLUDE HEADER: div.hxx
+USES INCLUDE HEADER: driver.hxx
+USES INCLUDE HEADER: schedule.hxx
+USES INCLUDE HEADER: timer.hxx
 
 
 
diff --git a/ODESolvers/src/solve.cxx b/ODESolvers/src/solve.cxx
index dc6f80ec7..493c12765 100644
--- a/ODESolvers/src/solve.cxx
+++ b/ODESolvers/src/solve.cxx
@@ -1,14 +1,12 @@
-// TODO: Don't include files from other thorns; create a proper interface
-#include "../../CarpetX/src/driver.hxx"
-#include "../../CarpetX/src/schedule.hxx"
-#include "../../CarpetX/src/timer.hxx"
-
 #include <cctk.h>
 #include <cctk_Parameters.h>
 #include <cctk_Arguments.h>
 #include <util_Table.h>
 
 #include <div.hxx>
+#include <driver.hxx>
+#include <schedule.hxx>
+#include <timer.hxx>
 
 #include <AMReX_MultiFab.H>