diff --git a/CommandStation-EX.ino b/CommandStation-EX.ino
index 2c520c0..57a178b 100644
--- a/CommandStation-EX.ino
+++ b/CommandStation-EX.ino
@@ -23,7 +23,6 @@
   #include "config.example.h"
 #endif
 
-
 /*
  *  © 2021 Neil McKechnie
  *  © 2020-2021 Chris Harlow, Harald Barth, David Cutting,
diff --git a/DCCRMT.cpp b/DCCRMT.cpp
index cc54274..8fe4270 100644
--- a/DCCRMT.cpp
+++ b/DCCRMT.cpp
@@ -17,9 +17,8 @@
  *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
-#include "defines.h"
 #if defined(ARDUINO_ARCH_ESP32)
+#include "defines.h"
 #include "DIAG.h"
 #include "DCCRMT.h"
 #include "DCCWaveform.h" // for MAX_PACKET_SIZE
diff --git a/DCCRMT.h b/DCCRMT.h
index 45d3eef..bae4bb9 100644
--- a/DCCRMT.h
+++ b/DCCRMT.h
@@ -17,9 +17,9 @@
  *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#if defined(ARDUINO_ARCH_ESP32)
 #pragma once
 #include <Arduino.h>
-#if defined(ARDUINO_ARCH_ESP32)
 #include "driver/rmt.h"
 #include "soc/rmt_reg.h"
 #include "soc/rmt_struct.h"