diff --git a/include/BufferManager.h b/include/BufferManager.h
index 7cc293ea0b3..960bcf0ff89 100644
--- a/include/BufferManager.h
+++ b/include/BufferManager.h
@@ -26,8 +26,8 @@
 #ifndef LMMS_BUFFER_MANAGER_H
 #define LMMS_BUFFER_MANAGER_H
 
+#include <cstddef>
 #include "lmms_export.h"
-#include "lmms_basics.h"
 
 namespace lmms
 {
diff --git a/include/SampleFrame.h b/include/SampleFrame.h
index 9ccb4ceed1a..53f4b0cf3ea 100644
--- a/include/SampleFrame.h
+++ b/include/SampleFrame.h
@@ -28,7 +28,9 @@
 
 #include "lmms_basics.h"
 
+#include <algorithm>
 #include <array>
+#include <cmath>
 #include <cstddef>
 
 
diff --git a/include/TimePos.h b/include/TimePos.h
index 06e52cc18ed..364521f9ad0 100644
--- a/include/TimePos.h
+++ b/include/TimePos.h
@@ -26,6 +26,7 @@
 #ifndef LMMS_TIME_POS_H
 #define LMMS_TIME_POS_H
 
+#include <cstddef>
 #include "lmms_export.h"
 #include "lmms_basics.h"
 
diff --git a/include/lmms_basics.h b/include/lmms_basics.h
index 33e07086a69..c7beb963dd0 100644
--- a/include/lmms_basics.h
+++ b/include/lmms_basics.h
@@ -25,16 +25,12 @@
 #ifndef LMMS_TYPES_H
 #define LMMS_TYPES_H
 
-#include <cstddef>
 #include <limits>
 
 #include "lmmsconfig.h"
 
 #include <cstdint>
-#include <array>
 
-#include <cmath>
-#include <algorithm>
 
 
 namespace lmms
diff --git a/plugins/ZynAddSubFx/LocalZynAddSubFx.h b/plugins/ZynAddSubFx/LocalZynAddSubFx.h
index 096534d5ebd..b88df0a2cb1 100644
--- a/plugins/ZynAddSubFx/LocalZynAddSubFx.h
+++ b/plugins/ZynAddSubFx/LocalZynAddSubFx.h
@@ -26,6 +26,7 @@
 #define LOCAL_ZYNADDSUBFX_H
 
 #include "Note.h"
+#include <array>
 
 class Master;
 class NulEngine;