diff --git a/examples/build-arch-log.txt b/examples/build-arch-log.txt
index e87a092472..7a3cda7746 100644
--- a/examples/build-arch-log.txt
+++ b/examples/build-arch-log.txt
@@ -2,3 +2,9 @@ esp32:esp32:esp32 ./examples-stream/streams-generator-serial -> rc=0
 esp32:esp32:esp32c3 ./examples-stream/streams-generator-serial -> rc=0
 esp32:esp32:esp32s3 ./examples-stream/streams-generator-serial -> rc=0
 esp32:esp32:esp32s2 ./examples-stream/streams-generator-serial -> rc=0
+esp32:esp32:esp32c6 ./examples-stream/streams-generator-serial -> rc=0
+esp8266:esp8266:generic ./examples-stream/streams-generator-serial -> rc=0
+rp2040:rp2040:generic ./examples-stream/streams-generator-serial -> rc=0
+arduino:avr:nano ./examples-stream/streams-generator-serial -> rc=0
+arduino:samd:arduino_zero_native ./examples-stream/streams-generator-serial -> rc=0
+arduino:renesas_uno:unor4wifi ./examples-stream/streams-generator-serial -> rc=1
diff --git a/src/AudioAnalog/AnalogAudioStream.h b/src/AudioAnalog/AnalogAudioStream.h
index db246be3ce..30ca92248d 100644
--- a/src/AudioAnalog/AnalogAudioStream.h
+++ b/src/AudioAnalog/AnalogAudioStream.h
@@ -1,14 +1,13 @@
 #pragma once
 #include "AudioConfig.h"
-#if defined(USE_ANALOG) 
-#include "AudioAnalog/AnalogDriverBase.h"
-#include "AudioAnalog/AnalogDriverESP32V1.h"
-#include "AudioAnalog/AnalogDriverESP32.h"
-#include "AudioAnalog/AnalogDriverMBED.h"
 
-#if defined(USE_ANALOG_ARDUINO) || defined(DOXYGEN)
+// Support AnalogAudioStream
+#if defined(USE_ANALOG) 
+#  include "AudioAnalog/AnalogDriverBase.h"
+#  include "AudioAnalog/AnalogDriverESP32V1.h"
+#  include "AudioAnalog/AnalogDriverESP32.h"
+#  include "AudioAnalog/AnalogDriverMBED.h"
 #  include "AudioAnalog/AnalogDriverArduino.h"
-#endif
 
 namespace audio_tools {
 
@@ -109,4 +108,9 @@ class AnalogAudioStream  : public AudioStream {
 
 }
 
-#endif
\ No newline at end of file
+#endif
+
+// Support AnalogAudioArduino
+#if defined(USE_TIMER)
+#  include "AudioAnalog/AnalogAudioArduino.h"
+#endif
diff --git a/src/AudioAnalog/AnalogDriverArduino.h b/src/AudioAnalog/AnalogDriverArduino.h
index 6dbcf70575..78b942c642 100644
--- a/src/AudioAnalog/AnalogDriverArduino.h
+++ b/src/AudioAnalog/AnalogDriverArduino.h
@@ -1,9 +1,10 @@
 #pragma once
 
-#include <limits.h>  // for INT_MIN and INT_MAX
+#include "AudioConfig.h"
+#if defined(USE_ANALOG_ARDUINO) || defined(DOXYGEN)
 
+#include <limits.h>  // for INT_MIN and INT_MAX
 #include "AudioAnalog/AnalogAudioBase.h"
-#include "AudioConfig.h"
 #include "AudioTimer/AudioTimer.h"
 #include "AudioTools/AudioStreams.h"
 #include "AudioTools/AudioTypes.h"
@@ -47,3 +48,5 @@ class AnalogDriverArduino : public AnalogDriverBase {
 using AnalogDriver = AnalogDriverArduino;
 
 }  // namespace audio_tools
+
+#endif
\ No newline at end of file