diff --git a/sources/Main.cpp b/sources/Main.cpp
index 5ca3fa42..ad666847 100644
--- a/sources/Main.cpp
+++ b/sources/Main.cpp
@@ -3,7 +3,6 @@
 #include <absl/flags/parse.h>
 #include <absl/types/span.h>
 #include <atomic>
-#include <bits/stdint-uintn.h>
 #include <cstddef>
 #include <ios>
 #include <iostream>
diff --git a/sources/OnePoleFilter.h b/sources/OnePoleFilter.h
index cffb58c1..137fa4ba 100644
--- a/sources/OnePoleFilter.h
+++ b/sources/OnePoleFilter.h
@@ -1,5 +1,6 @@
 #pragma once
 #include "Globals.h"
+#include "Helpers.h"
 #include <absl/types/span.h>
 #include <cmath>
 
@@ -11,7 +12,7 @@ public:
     template <class C>
     static Type normalizedGain(Type cutoff, C sampleRate)
     {
-        return std::tan(cutoff / static_cast<Type>(sampleRate) * M_PIf32);
+        return std::tan(cutoff / static_cast<Type>(sampleRate) * pi<float>);
     }
 
     OnePoleFilter(Type gain)
diff --git a/sources/Region.cpp b/sources/Region.cpp
index 09ae77a0..52558a12 100644
--- a/sources/Region.cpp
+++ b/sources/Region.cpp
@@ -1,7 +1,6 @@
 #include "Region.h"
 #include "Helpers.h"
 #include "absl/strings/str_replace.h"
-#include <bits/stdint-uintn.h>
 #include <random>
 
 bool sfz::Region::parseOpcode(const Opcode& opcode)
diff --git a/sources/Region.h b/sources/Region.h
index 5654e198..a88111d0 100644
--- a/sources/Region.h
+++ b/sources/Region.h
@@ -5,7 +5,6 @@
 #include "Helpers.h"
 #include "Opcode.h"
 #include "StereoBuffer.h"
-#include <bits/stdint-uintn.h>
 #include <bitset>
 #include <optional>
 #include <random>