diff --git a/lib/micropython/gen-qstr.sh b/lib/micropython/gen-qstr.sh
index 78ecf851363be7946005203330b18402bfd3aed5..747ae3f614104dadf98e0d579ccc3c0ae22a1c6f 100755
--- a/lib/micropython/gen-qstr.sh
+++ b/lib/micropython/gen-qstr.sh
@@ -11,7 +11,6 @@ shift 5
 
 OUTPUT_DIR="$(dirname "$OUTPUT")"
 
-
 # call gcc -E to generate qstr.i.last
 gcc -E -DNO_QSTR -I"$SOURCE_DIR/micropython" -I"$PROJECT_SRC" -I"$OUTPUT_DIR" "$@" >"$OUTPUT_DIR/qstr.i.last"
 
diff --git a/pycardium/meson.build b/pycardium/meson.build
index aa637280ad625f1b482f654f5c4f293fcfe33668..3007f7b0d2855813c15fc327e1eca1d329bc28d3 100644
--- a/pycardium/meson.build
+++ b/pycardium/meson.build
@@ -79,7 +79,7 @@ upy = static_library(
   micropython_additional_sources,
   micropython_extmod_sources,
   mp_headers,
-  include_directories: micropython_includes,
+  include_directories: [micropython_includes, include_directories('../epicardium')],
   c_args: '-w',
 )
 
diff --git a/pycardium/mpconfigport.h b/pycardium/mpconfigport.h
index 359bf799e937e2d738019db898c3c33f0bd178f2..03fd3d3ff9a087cfc5522fb371d5c453dfddeb79 100644
--- a/pycardium/mpconfigport.h
+++ b/pycardium/mpconfigport.h
@@ -1,7 +1,3 @@
-// TODO: we need this define, but the header is not found...
-//#include "epicardium/epicardium.h"
-#define EPIC_INT_NUM                    9
-
 /* Hardware Name */
 #define MICROPY_HW_BOARD_NAME "card10"
 #define MICROPY_HW_MCU_NAME "max32666"
@@ -97,6 +93,12 @@ typedef long mp_off_t;
 /* TODO: Document this */
 #define MP_STATE_PORT MP_STATE_VM
 
+#ifndef NO_QSTR
+#include "epicardium.h"
+#else
+#define EPIC_INT_NUM 1
+#endif
+
 /* For some reason, we need to define readline history manually */
 #define MICROPY_PORT_ROOT_POINTERS \
     const char *readline_hist[16]; \