diff --git a/icicle_fe/include/icicle/fields/host_math.h b/icicle_fe/include/icicle/fields/host_math.h
index ceb4f0d36..b3afdf680 100644
--- a/icicle_fe/include/icicle/fields/host_math.h
+++ b/icicle_fe/include/icicle/fields/host_math.h
@@ -3,7 +3,6 @@
 #define HOST_MATH_H
 
 #include <cstdint>
-#include <cuda_runtime.h>
 #include "utils/modifiers.h"
 namespace host_math {
 
diff --git a/icicle_fe/include/icicle/utils/modifiers.h b/icicle_fe/include/icicle/utils/modifiers.h
index 523e17fc3..ffe86d69c 100644
--- a/icicle_fe/include/icicle/utils/modifiers.h
+++ b/icicle_fe/include/icicle/utils/modifiers.h
@@ -3,6 +3,7 @@
 #pragma once
 
 #ifdef __CUDACC__
+#include <cuda_runtime.h>
 #if defined(DEVMODE) || defined(DEBUG)
 #define INLINE_MACRO
 #define UNROLL
@@ -20,4 +21,6 @@
 #define HOST_INLINE
 #define DEVICE_INLINE
 #define HOST_DEVICE_INLINE
+#define __host__
+#define __device__
 #endif
diff --git a/icicle_fe/tests/CMakeLists.txt b/icicle_fe/tests/CMakeLists.txt
index 8b3e10c0f..e23f2a4e3 100644
--- a/icicle_fe/tests/CMakeLists.txt
+++ b/icicle_fe/tests/CMakeLists.txt
@@ -30,4 +30,5 @@ target_link_libraries(test_field_api PRIVATE -Wl,--whole-archive icicle_cpu_devi
 target_link_libraries(test_field_api PRIVATE -Wl,--whole-archive icicle_cuda_device icicle_cuda_field -Wl,--no-whole-archive)
 
 enable_testing()
-gtest_discover_tests(test_device_api)
\ No newline at end of file
+gtest_discover_tests(test_device_api)
+gtest_discover_tests(test_field_api)
\ No newline at end of file