diff --git a/src/Bus.h b/src/Bus.h
index 33bad93..c5dd224 100644
--- a/src/Bus.h
+++ b/src/Bus.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-// #include <Embedded_Template_Library.h> // Mandatory for Arduino IDE only
 #include <etl/vector.h>
 
 #include "ln_opc.h"
diff --git a/src/LocoNet2.h b/src/LocoNet2.h
index 6cd5435..9d9e7b8 100644
--- a/src/LocoNet2.h
+++ b/src/LocoNet2.h
@@ -66,8 +66,8 @@
 #pragma once
 
 #include <map>
-#ifdef ARDUINO
-#include <Embedded_Template_Library.h> // Mandatory for Arduino IDE only
+#if defined(ARDUINO) && __has_include(<Embedded_Template_Library.h>)
+  #include <Embedded_Template_Library.h> // Mandatory for Arduino IDE only
 #endif
 #include <etl/vector.h>
 #include <vector>