diff --git a/AudioOutput.h b/AudioOutput.h
index 46581d098..b94c1d4cf 100644
--- a/AudioOutput.h
+++ b/AudioOutput.h
@@ -57,7 +57,7 @@
 
 #ifndef AUDIOOUTPUT_H
 #define AUDIOOUTPUT_H
-#include <FixMath.h>
+#include "mozzi_fixmath.h"
 
 /** The type used to store a single channel of a single frame, internally. For compatibility with earlier versions of Mozzi this is defined as int.
  *  If you do not care about keeping old sketches working, you may be able to save some RAM by using int16_t, instead (on boards where int is larger
diff --git a/Line.h b/Line.h
index fabdfbb27..1f53d3bea 100644
--- a/Line.h
+++ b/Line.h
@@ -15,7 +15,7 @@
 
 #include <Arduino.h>
 
-#include<FixMath.h>
+#include "mozzi_fixmath.h"
 
 /** For linear changes with a minimum of calculation at each step. For instance,
 you can use Line to make an oscillator glide from one frequency to another,
diff --git a/MetaOscil.h b/MetaOscil.h
index 43671f350..af5284d17 100644
--- a/MetaOscil.h
+++ b/MetaOscil.h
@@ -20,7 +20,6 @@
 
 #include "Oscil.h"
 #include "mozzi_fixmath.h"
-#include <FixMath.h>
 
 
 /**
diff --git a/Oscil.h b/Oscil.h
index b5253a9b1..a6c9e4097 100644
--- a/Oscil.h
+++ b/Oscil.h
@@ -19,7 +19,6 @@
 #include "Arduino.h"
 #include "MozziHeadersOnly.h"
 #include "mozzi_fixmath.h"
-#include "FixMath.h"
 #include "mozzi_pgmspace.h"
 
 #ifdef OSCIL_DITHER_PHASE
diff --git a/mozzi_fixmath.h b/mozzi_fixmath.h
index 7fba4783d..ac5b6c0f6 100644
--- a/mozzi_fixmath.h
+++ b/mozzi_fixmath.h
@@ -13,6 +13,7 @@
 #define FIXEDMATH_H_
 
 #include <Arduino.h>
+#include <FixMath.h>
 
 /** @defgroup fixmath Fast integer based fixed-point arithmetic