diff --git a/speeduino/board_teensy35.h b/speeduino/board_teensy35.h
index aa6dd4d7..f2616775 100644
--- a/speeduino/board_teensy35.h
+++ b/speeduino/board_teensy35.h
@@ -1,6 +1,6 @@
 #ifndef TEENSY35_H
 #define TEENSY35_H
-#if defined(CORE_TEENSY)
+#if defined(CORE_TEENSY) && defined(CORE_TEENSY35)
 
 /*
 ***********************************************************************************************************
diff --git a/speeduino/board_teensy35.ino b/speeduino/board_teensy35.ino
index be5e0400..b566cc51 100644
--- a/speeduino/board_teensy35.ino
+++ b/speeduino/board_teensy35.ino
@@ -1,4 +1,4 @@
-#if defined(CORE_TEENSY)
+#if defined(CORE_TEENSY) && defined(CORE_TEENSY35)
 #include "board_teensy35.h"
 #include "globals.h"
 #include "auxiliaries.h"
diff --git a/speeduino/globals.h b/speeduino/globals.h
index 15160931..939ea008 100644
--- a/speeduino/globals.h
+++ b/speeduino/globals.h
@@ -16,7 +16,13 @@
   //#define TIMER5_MICROS
 
 #elif defined(CORE_TEENSY)
-  #define BOARD_H "board_teensy35.h"
+  #if defined(__MK64FX512__) || defined(__MK66FX1M0__)
+    #define CORE_TEENSY35
+    #define BOARD_H "board_teensy35.h"
+  #elif defined(__IMXRT1062__)
+    #define CORE_TEENSY40
+    #define BOARD_H "board_teensy40.h"
+  #endif
   #define INJ_CHANNELS 8
   #define IGN_CHANNELS 8