diff --git a/MicroDexed.ino b/MicroDexed.ino
index 99b767b..d3c5ef3 100644
--- a/MicroDexed.ino
+++ b/MicroDexed.ino
@@ -22,8 +22,8 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 */
 
-#include "config.h"
 #include <limits.h>
+#include "config.h"
 #include <Audio.h>
 #include <Wire.h>
 #include <SPI.h>
diff --git a/config.h b/config.h
index c42f371..224070c 100644
--- a/config.h
+++ b/config.h
@@ -26,6 +26,7 @@
 #ifndef CONFIG_H_INCLUDED
 #define CONFIG_H_INCLUDED
 
+#include <Arduino.h>
 #include "midinotes.h"
 
 // ATTENTION! For better latency you have to redefine AUDIO_BLOCK_SAMPLES from
diff --git a/dexed.cpp b/dexed.cpp
index b12eb77..31617af 100644
--- a/dexed.cpp
+++ b/dexed.cpp
@@ -23,9 +23,9 @@
 
 */
 
+#include "config.h"
 #include "synth.h"
 #include "dexed.h"
-#include "config.h"
 #include "EngineMkI.h"
 #include "EngineOpl.h"
 #include "fm_core.h"
diff --git a/dexed_sysex.cpp b/dexed_sysex.cpp
index 126af77..daeccd2 100644
--- a/dexed_sysex.cpp
+++ b/dexed_sysex.cpp
@@ -24,12 +24,12 @@
 */
 
 #include <Arduino.h>
+#include "config.h"
 #include <Wire.h>
 #include <SPI.h>
 #include <SD.h>
 #include "dexed.h"
 #include "dexed_sysex.h"
-#include "config.h"
 
 extern Dexed* MicroDexed[NUM_DEXED];
 
diff --git a/effect_modulated_delay.cpp b/effect_modulated_delay.cpp
index d9a1f99..afb3697 100644
--- a/effect_modulated_delay.cpp
+++ b/effect_modulated_delay.cpp
@@ -22,10 +22,10 @@
 */
 
 #include <Arduino.h>
+#include "config.h"
 #include <Audio.h>
 #include "arm_math.h"
 #include "effect_modulated_delay.h"
-#include "config.h"
 
 extern config_t configuration;
 
diff --git a/fm_op_kernel.cpp b/fm_op_kernel.cpp
index d3bd0cf..f730d63 100644
--- a/fm_op_kernel.cpp
+++ b/fm_op_kernel.cpp
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include "config.h"
 #include <math.h>
 
 #include <cstdlib>
@@ -25,7 +26,6 @@
 #include "synth.h"
 #include "sin.h"
 #include "fm_op_kernel.h"
-#include "config.h"
 
 #ifdef HAVE_NEON
 static bool hasNeon() {