diff --git a/nac3core/irrt/irrt.cpp b/nac3core/irrt/irrt.cpp index f717bf3c6..404681cc8 100644 --- a/nac3core/irrt/irrt.cpp +++ b/nac3core/irrt/irrt.cpp @@ -1,6 +1,6 @@ -#include -#include -#include -#include -#include -#include +#include "irrt/exception.hpp" +#include "irrt/int_types.hpp" +#include "irrt/list.hpp" +#include "irrt/math.hpp" +#include "irrt/ndarray.hpp" +#include "irrt/slice.hpp" diff --git a/nac3core/irrt/irrt/cslice.hpp b/nac3core/irrt/irrt/cslice.hpp index 587123965..6f1d0a278 100644 --- a/nac3core/irrt/irrt/cslice.hpp +++ b/nac3core/irrt/irrt/cslice.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include "irrt/int_types.hpp" template struct CSlice { diff --git a/nac3core/irrt/irrt/exception.hpp b/nac3core/irrt/irrt/exception.hpp index 4c1f0cb79..5b1ec590d 100644 --- a/nac3core/irrt/irrt/exception.hpp +++ b/nac3core/irrt/irrt/exception.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "irrt/cslice.hpp" +#include "irrt/int_types.hpp" /** * @brief The int type of ARTIQ exception IDs. diff --git a/nac3core/irrt/irrt/list.hpp b/nac3core/irrt/irrt/list.hpp index 098416398..b389197fb 100644 --- a/nac3core/irrt/irrt/list.hpp +++ b/nac3core/irrt/irrt/list.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "irrt/int_types.hpp" +#include "irrt/math_util.hpp" extern "C" { // Handle list assignment and dropping part of the list when diff --git a/nac3core/irrt/irrt/ndarray.hpp b/nac3core/irrt/irrt/ndarray.hpp index a946741b5..5dda17390 100644 --- a/nac3core/irrt/irrt/ndarray.hpp +++ b/nac3core/irrt/irrt/ndarray.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include "irrt/int_types.hpp" namespace { template diff --git a/nac3core/irrt/irrt/slice.hpp b/nac3core/irrt/irrt/slice.hpp index e2ce2d8c0..a1523ddc6 100644 --- a/nac3core/irrt/irrt/slice.hpp +++ b/nac3core/irrt/irrt/slice.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include "irrt/int_types.hpp" extern "C" { SliceIndex __nac3_slice_index_bound(SliceIndex i, const SliceIndex len) {