From 5f1b39076366aa663c69000f669e55a096c9b9f6 Mon Sep 17 00:00:00 2001
From: Liwei Ji <jiliwei.phys@gmail.com>
Date: Wed, 30 Oct 2024 21:52:51 -0400
Subject: [PATCH 1/3] CarpetX: make driver.hxx and schedule.hxx visible to
 other thorns

---
 CarpetX/interface.ccl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CarpetX/interface.ccl b/CarpetX/interface.ccl
index 13a3c03d0..ac595c767 100644
--- a/CarpetX/interface.ccl
+++ b/CarpetX/interface.ccl
@@ -15,6 +15,7 @@ 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
 
 

From 91b87fad516a26bb035f768c93c379fec486cb27 Mon Sep 17 00:00:00 2001
From: Liwei Ji <jiliwei.phys@gmail.com>
Date: Tue, 12 Nov 2024 08:18:13 -0500
Subject: [PATCH 2/3] CarpetX: make timer.hxx visible to other thorns

---
 CarpetX/interface.ccl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CarpetX/interface.ccl b/CarpetX/interface.ccl
index ac595c767..5c6b7dc7a 100644
--- a/CarpetX/interface.ccl
+++ b/CarpetX/interface.ccl
@@ -17,6 +17,7 @@ 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
 
 
 

From 14ea39b1822c2e39c51eb376aabac2bd497e3f75 Mon Sep 17 00:00:00 2001
From: Liwei Ji <jiliwei.phys@gmail.com>
Date: Tue, 12 Nov 2024 08:22:30 -0500
Subject: [PATCH 3/3] ODESolvers: use proper interface to access CarpetX
 headers

---
 ODESolvers/interface.ccl | 3 +++
 ODESolvers/src/solve.cxx | 8 +++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

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>