From 0483e0334dad19dada31fc3cf4d448c6aac0dd8a Mon Sep 17 00:00:00 2001
From: Kai Blaschke <kai.blaschke@kb-dev.net>
Date: Fri, 10 Oct 2025 14:36:44 +0200
Subject: [PATCH 1/7] Fix includes and some comments

---
 src/libprojectM/Audio/CMakeLists.txt             |  2 +-
 src/libprojectM/Audio/FrameAudioData.hpp         |  5 +++--
 src/libprojectM/Audio/Loudness.cpp               |  2 +-
 src/libprojectM/Audio/Loudness.hpp               |  2 +-
 src/libprojectM/Audio/MilkdropFFT.cpp            |  2 +-
 src/libprojectM/Audio/PCM.cpp                    |  2 +-
 src/libprojectM/Audio/PCM.hpp                    | 10 +++++-----
 src/libprojectM/Audio/WaveformAligner.cpp        |  2 +-
 src/libprojectM/Audio/WaveformAligner.hpp        |  2 +-
 src/libprojectM/MilkdropPreset/BlurTexture.hpp   |  4 +---
 src/libprojectM/MilkdropPreset/Border.cpp        |  2 ++
 src/libprojectM/MilkdropPreset/Border.hpp        |  1 -
 .../MilkdropPreset/CustomWaveform.hpp            |  2 +-
 .../MilkdropPreset/MilkdropPreset.hpp            |  3 ---
 .../MilkdropPreset/MilkdropShader.cpp            |  1 -
 .../MilkdropPreset/MilkdropShader.hpp            |  2 +-
 .../MilkdropPreset/PerPixelContext.cpp           |  1 +
 .../MilkdropPreset/PerPixelContext.hpp           |  2 +-
 src/libprojectM/MilkdropPreset/PerPixelMesh.hpp  |  3 +--
 src/libprojectM/MilkdropPreset/PresetState.cpp   |  2 +-
 .../MilkdropPreset/ShapePerFrameContext.cpp      |  1 -
 src/libprojectM/MilkdropPreset/Waveform.hpp      |  1 -
 .../MilkdropPreset/Waveforms/CenteredSpiro.cpp   |  2 +-
 .../MilkdropPreset/Waveforms/DerivativeLine.cpp  |  2 +-
 .../MilkdropPreset/Waveforms/DoubleLine.cpp      |  2 +-
 .../MilkdropPreset/Waveforms/ExplosiveHash.cpp   |  2 +-
 .../MilkdropPreset/Waveforms/Factory.hpp         |  2 +-
 .../MilkdropPreset/Waveforms/Line.cpp            |  2 +-
 .../MilkdropPreset/Waveforms/LineBase.cpp        |  2 +-
 .../MilkdropPreset/Waveforms/SpectrumLine.cpp    |  2 +-
 src/libprojectM/PresetFactoryManager.cpp         |  4 ++--
 src/libprojectM/ProjectM.hpp                     |  1 -
 src/libprojectM/ProjectMCWrapper.cpp             |  4 ++--
 src/libprojectM/Renderer/CopyTexture.cpp         |  2 +-
 src/libprojectM/Renderer/Framebuffer.cpp         |  2 +-
 src/libprojectM/Renderer/Mesh.cpp                |  2 +-
 src/libprojectM/Renderer/Mesh.hpp                | 16 +++++++---------
 src/libprojectM/Renderer/MilkdropNoise.cpp       |  2 +-
 src/libprojectM/Renderer/PresetTransition.cpp    |  6 ++----
 src/libprojectM/Renderer/TextureAttachment.cpp   |  2 +-
 src/libprojectM/Renderer/TextureManager.cpp      | 13 +++++++------
 .../Renderer/TextureSamplerDescriptor.cpp        |  4 ++--
 .../Renderer/TransitionShaderManager.cpp         |  4 +---
 src/libprojectM/Renderer/VertexArray.hpp         |  3 ---
 src/libprojectM/Renderer/VertexIndexArray.cpp    |  2 +-
 src/libprojectM/UserSprites/MilkdropSprite.cpp   |  3 ++-
 46 files changed, 63 insertions(+), 77 deletions(-)

diff --git a/src/libprojectM/Audio/CMakeLists.txt b/src/libprojectM/Audio/CMakeLists.txt
index c5db70b07e..99685b95c4 100644
--- a/src/libprojectM/Audio/CMakeLists.txt
+++ b/src/libprojectM/Audio/CMakeLists.txt
@@ -14,7 +14,7 @@ add_library(Audio OBJECT
 
 target_include_directories(Audio
         PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}
+        ${CMAKE_CURRENT_SOURCE_DIR}/..
         )
 
 target_link_libraries(Audio
diff --git a/src/libprojectM/Audio/FrameAudioData.hpp b/src/libprojectM/Audio/FrameAudioData.hpp
index f905bb33a0..98ed4177ab 100644
--- a/src/libprojectM/Audio/FrameAudioData.hpp
+++ b/src/libprojectM/Audio/FrameAudioData.hpp
@@ -6,8 +6,9 @@
  */
 #pragma once
 
-#include "projectM-4/projectM_export.h"
-#include "AudioConstants.hpp"
+#include "Audio/AudioConstants.hpp"
+
+#include <projectM-4/projectM_export.h>
 
 #include <array>
 
diff --git a/src/libprojectM/Audio/Loudness.cpp b/src/libprojectM/Audio/Loudness.cpp
index 2139c92406..0f8d6371dd 100644
--- a/src/libprojectM/Audio/Loudness.cpp
+++ b/src/libprojectM/Audio/Loudness.cpp
@@ -1,4 +1,4 @@
-#include "Loudness.hpp"
+#include "Audio/Loudness.hpp"
 
 #include <cmath>
 
diff --git a/src/libprojectM/Audio/Loudness.hpp b/src/libprojectM/Audio/Loudness.hpp
index 55f3baf8cf..7d453bd297 100644
--- a/src/libprojectM/Audio/Loudness.hpp
+++ b/src/libprojectM/Audio/Loudness.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "AudioConstants.hpp"
+#include "Audio/AudioConstants.hpp"
 
 #include <array>
 #include <cstdint>
diff --git a/src/libprojectM/Audio/MilkdropFFT.cpp b/src/libprojectM/Audio/MilkdropFFT.cpp
index 83dfe128d4..134f338a17 100644
--- a/src/libprojectM/Audio/MilkdropFFT.cpp
+++ b/src/libprojectM/Audio/MilkdropFFT.cpp
@@ -27,7 +27,7 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISI
 OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "MilkdropFFT.hpp"
+#include "Audio/MilkdropFFT.hpp"
 
 namespace libprojectM {
 namespace Audio {
diff --git a/src/libprojectM/Audio/PCM.cpp b/src/libprojectM/Audio/PCM.cpp
index 56a7cc65d0..bc7c83c59a 100755
--- a/src/libprojectM/Audio/PCM.cpp
+++ b/src/libprojectM/Audio/PCM.cpp
@@ -1,4 +1,4 @@
-#include "PCM.hpp"
+#include "Audio/PCM.hpp"
 
 namespace libprojectM {
 namespace Audio {
diff --git a/src/libprojectM/Audio/PCM.hpp b/src/libprojectM/Audio/PCM.hpp
index 602e2490fb..bfda1a4235 100755
--- a/src/libprojectM/Audio/PCM.hpp
+++ b/src/libprojectM/Audio/PCM.hpp
@@ -7,11 +7,11 @@
 
 #pragma once
 
-#include "AudioConstants.hpp"
-#include "FrameAudioData.hpp"
-#include "Loudness.hpp"
-#include "MilkdropFFT.hpp"
-#include "WaveformAligner.hpp"
+#include "Audio/AudioConstants.hpp"
+#include "Audio/FrameAudioData.hpp"
+#include "Audio/Loudness.hpp"
+#include "Audio/MilkdropFFT.hpp"
+#include "Audio/WaveformAligner.hpp"
 
 #include <projectM-4/projectM_export.h>
 
diff --git a/src/libprojectM/Audio/WaveformAligner.cpp b/src/libprojectM/Audio/WaveformAligner.cpp
index 6d59f5aca0..a92eea200c 100644
--- a/src/libprojectM/Audio/WaveformAligner.cpp
+++ b/src/libprojectM/Audio/WaveformAligner.cpp
@@ -1,4 +1,4 @@
-#include "WaveformAligner.hpp"
+#include "Audio/WaveformAligner.hpp"
 
 #include <algorithm>
 #include <cmath>
diff --git a/src/libprojectM/Audio/WaveformAligner.hpp b/src/libprojectM/Audio/WaveformAligner.hpp
index 74b7e616a1..9c0950b4f7 100644
--- a/src/libprojectM/Audio/WaveformAligner.hpp
+++ b/src/libprojectM/Audio/WaveformAligner.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "AudioConstants.hpp"
+#include "Audio/AudioConstants.hpp"
 
 #include <cstddef>
 #include <cstdint>
diff --git a/src/libprojectM/MilkdropPreset/BlurTexture.hpp b/src/libprojectM/MilkdropPreset/BlurTexture.hpp
index 04647a5a80..bfab458fbb 100644
--- a/src/libprojectM/MilkdropPreset/BlurTexture.hpp
+++ b/src/libprojectM/MilkdropPreset/BlurTexture.hpp
@@ -4,10 +4,8 @@
  */
 #pragma once
 
-#include "Renderer/Mesh.hpp"
-
-
 #include <Renderer/Framebuffer.hpp>
+#include <Renderer/Mesh.hpp>
 #include <Renderer/RenderContext.hpp>
 #include <Renderer/Shader.hpp>
 #include <Renderer/TextureSamplerDescriptor.hpp>
diff --git a/src/libprojectM/MilkdropPreset/Border.cpp b/src/libprojectM/MilkdropPreset/Border.cpp
index 10dd8c9d90..f5805e4e80 100644
--- a/src/libprojectM/MilkdropPreset/Border.cpp
+++ b/src/libprojectM/MilkdropPreset/Border.cpp
@@ -1,5 +1,7 @@
 #include "Border.hpp"
 
+#include "PerFrameContext.hpp"
+
 #include <Renderer/BlendMode.hpp>
 
 namespace libprojectM {
diff --git a/src/libprojectM/MilkdropPreset/Border.hpp b/src/libprojectM/MilkdropPreset/Border.hpp
index b8f8f7eeb8..839398ca19 100644
--- a/src/libprojectM/MilkdropPreset/Border.hpp
+++ b/src/libprojectM/MilkdropPreset/Border.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "PerFrameContext.hpp"
 #include "PresetState.hpp"
 
 #include <Renderer/Mesh.hpp>
diff --git a/src/libprojectM/MilkdropPreset/CustomWaveform.hpp b/src/libprojectM/MilkdropPreset/CustomWaveform.hpp
index e82687ae91..7e16d6afce 100644
--- a/src/libprojectM/MilkdropPreset/CustomWaveform.hpp
+++ b/src/libprojectM/MilkdropPreset/CustomWaveform.hpp
@@ -5,7 +5,7 @@
 
 #include <Renderer/Color.hpp>
 #include <Renderer/Mesh.hpp>
-#include "Renderer/Point.hpp"
+#include <Renderer/Point.hpp>
 
 #include <vector>
 
diff --git a/src/libprojectM/MilkdropPreset/MilkdropPreset.hpp b/src/libprojectM/MilkdropPreset/MilkdropPreset.hpp
index 06fa470bb7..c1f0ab17de 100644
--- a/src/libprojectM/MilkdropPreset/MilkdropPreset.hpp
+++ b/src/libprojectM/MilkdropPreset/MilkdropPreset.hpp
@@ -27,7 +27,6 @@
 #include "CustomShape.hpp"
 #include "CustomWaveform.hpp"
 #include "DarkenCenter.hpp"
-#include "Filters.hpp"
 #include "FinalComposite.hpp"
 #include "MotionVectors.hpp"
 #include "PerFrameContext.hpp"
@@ -39,8 +38,6 @@
 #include <Renderer/CopyTexture.hpp>
 #include <Renderer/Framebuffer.hpp>
 
-#include <cassert>
-#include <map>
 #include <memory>
 #include <string>
 
diff --git a/src/libprojectM/MilkdropPreset/MilkdropShader.cpp b/src/libprojectM/MilkdropPreset/MilkdropShader.cpp
index a19af6512b..d9e325a1df 100644
--- a/src/libprojectM/MilkdropPreset/MilkdropShader.cpp
+++ b/src/libprojectM/MilkdropPreset/MilkdropShader.cpp
@@ -1,6 +1,5 @@
 #include "MilkdropShader.hpp"
 
-#include "PerFrameContext.hpp"
 #include "PresetState.hpp"
 #include "Utils.hpp"
 
diff --git a/src/libprojectM/MilkdropPreset/MilkdropShader.hpp b/src/libprojectM/MilkdropPreset/MilkdropShader.hpp
index 4f8165dc7b..2997a8208c 100644
--- a/src/libprojectM/MilkdropPreset/MilkdropShader.hpp
+++ b/src/libprojectM/MilkdropPreset/MilkdropShader.hpp
@@ -1,5 +1,5 @@
 /**
- * @file MilkdropShader
+ * @file MilkdropShader.hpp
  * @brief Holds a warp or composite shader of Milkdrop presets.
  *
  * This class wraps the conversion from HLSL shader code to GLSL and also manages the
diff --git a/src/libprojectM/MilkdropPreset/PerPixelContext.cpp b/src/libprojectM/MilkdropPreset/PerPixelContext.cpp
index ce19ff47f4..2942a7f2fe 100644
--- a/src/libprojectM/MilkdropPreset/PerPixelContext.cpp
+++ b/src/libprojectM/MilkdropPreset/PerPixelContext.cpp
@@ -1,6 +1,7 @@
 #include "PerPixelContext.hpp"
 
 #include "MilkdropPresetExceptions.hpp"
+#include "PerFrameContext.hpp"
 
 #include <Logging.hpp>
 
diff --git a/src/libprojectM/MilkdropPreset/PerPixelContext.hpp b/src/libprojectM/MilkdropPreset/PerPixelContext.hpp
index 9bd25ba1b0..e20acadb21 100644
--- a/src/libprojectM/MilkdropPreset/PerPixelContext.hpp
+++ b/src/libprojectM/MilkdropPreset/PerPixelContext.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "PerFrameContext.hpp"
 #include "PresetState.hpp"
 
 #include <projectm-eval.h>
@@ -36,6 +35,7 @@ class PerPixelContext
      * is an undocumented feature, we should do the same as some presets may depend on it.
      *
      * @param state The preset state container.
+     * @param perFrameState The per-frame execution context.
      */
     void LoadStateReadOnlyVariables(PresetState& state, PerFrameContext& perFrameState);
 
diff --git a/src/libprojectM/MilkdropPreset/PerPixelMesh.hpp b/src/libprojectM/MilkdropPreset/PerPixelMesh.hpp
index f9a51c02b8..dda77f114b 100644
--- a/src/libprojectM/MilkdropPreset/PerPixelMesh.hpp
+++ b/src/libprojectM/MilkdropPreset/PerPixelMesh.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
-#include "Renderer/Mesh.hpp"
-
+#include <Renderer/Mesh.hpp>
 #include <Renderer/Shader.hpp>
 
 namespace libprojectM {
diff --git a/src/libprojectM/MilkdropPreset/PresetState.cpp b/src/libprojectM/MilkdropPreset/PresetState.cpp
index 1838269cd1..0913ac3775 100644
--- a/src/libprojectM/MilkdropPreset/PresetState.cpp
+++ b/src/libprojectM/MilkdropPreset/PresetState.cpp
@@ -3,7 +3,7 @@
 #include "MilkdropStaticShaders.hpp"
 #include "PresetFileParser.hpp"
 
-#include "Renderer/ShaderCache.hpp"
+#include <Renderer/ShaderCache.hpp>
 
 #include <glm/gtc/matrix_transform.hpp>
 
diff --git a/src/libprojectM/MilkdropPreset/ShapePerFrameContext.cpp b/src/libprojectM/MilkdropPreset/ShapePerFrameContext.cpp
index 5877692f31..e31f5332db 100644
--- a/src/libprojectM/MilkdropPreset/ShapePerFrameContext.cpp
+++ b/src/libprojectM/MilkdropPreset/ShapePerFrameContext.cpp
@@ -2,7 +2,6 @@
 
 #include "CustomShape.hpp"
 #include "MilkdropPresetExceptions.hpp"
-#include "PerFrameContext.hpp"
 
 #include <Logging.hpp>
 
diff --git a/src/libprojectM/MilkdropPreset/Waveform.hpp b/src/libprojectM/MilkdropPreset/Waveform.hpp
index 93d9446979..5e6084aab8 100644
--- a/src/libprojectM/MilkdropPreset/Waveform.hpp
+++ b/src/libprojectM/MilkdropPreset/Waveform.hpp
@@ -7,7 +7,6 @@
 #include <Renderer/Mesh.hpp>
 
 #include <memory>
-#include <vector>
 
 namespace libprojectM {
 namespace MilkdropPreset {
diff --git a/src/libprojectM/MilkdropPreset/Waveforms/CenteredSpiro.cpp b/src/libprojectM/MilkdropPreset/Waveforms/CenteredSpiro.cpp
index d9ca7403c2..b7052b10ee 100644
--- a/src/libprojectM/MilkdropPreset/Waveforms/CenteredSpiro.cpp
+++ b/src/libprojectM/MilkdropPreset/Waveforms/CenteredSpiro.cpp
@@ -1,4 +1,4 @@
-#include "CenteredSpiro.hpp"
+#include "Waveforms/CenteredSpiro.hpp"
 
 #include <Audio/AudioConstants.hpp>
 
diff --git a/src/libprojectM/MilkdropPreset/Waveforms/DerivativeLine.cpp b/src/libprojectM/MilkdropPreset/Waveforms/DerivativeLine.cpp
index fd6eb04937..a4b919c7b5 100644
--- a/src/libprojectM/MilkdropPreset/Waveforms/DerivativeLine.cpp
+++ b/src/libprojectM/MilkdropPreset/Waveforms/DerivativeLine.cpp
@@ -1,4 +1,4 @@
-#include "DerivativeLine.hpp"
+#include "Waveforms/DerivativeLine.hpp"
 
 #include "PresetState.hpp"
 
diff --git a/src/libprojectM/MilkdropPreset/Waveforms/DoubleLine.cpp b/src/libprojectM/MilkdropPreset/Waveforms/DoubleLine.cpp
index ac0f4067ac..158184951f 100644
--- a/src/libprojectM/MilkdropPreset/Waveforms/DoubleLine.cpp
+++ b/src/libprojectM/MilkdropPreset/Waveforms/DoubleLine.cpp
@@ -1,4 +1,4 @@
-#include "DoubleLine.hpp"
+#include "Waveforms/DoubleLine.hpp"
 
 #include "PresetState.hpp"
 
diff --git a/src/libprojectM/MilkdropPreset/Waveforms/ExplosiveHash.cpp b/src/libprojectM/MilkdropPreset/Waveforms/ExplosiveHash.cpp
index ff204e23da..02f9541499 100644
--- a/src/libprojectM/MilkdropPreset/Waveforms/ExplosiveHash.cpp
+++ b/src/libprojectM/MilkdropPreset/Waveforms/ExplosiveHash.cpp
@@ -1,4 +1,4 @@
-#include "ExplosiveHash.hpp"
+#include "Waveforms/ExplosiveHash.hpp"
 
 #include "PresetState.hpp"
 
diff --git a/src/libprojectM/MilkdropPreset/Waveforms/Factory.hpp b/src/libprojectM/MilkdropPreset/Waveforms/Factory.hpp
index 1a33d6e6fe..22d6e1e26b 100644
--- a/src/libprojectM/MilkdropPreset/Waveforms/Factory.hpp
+++ b/src/libprojectM/MilkdropPreset/Waveforms/Factory.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "WaveformMath.hpp"
+#include "Waveforms/WaveformMath.hpp"
 
 #include <memory>
 
diff --git a/src/libprojectM/MilkdropPreset/Waveforms/Line.cpp b/src/libprojectM/MilkdropPreset/Waveforms/Line.cpp
index a180baaebe..23df857588 100644
--- a/src/libprojectM/MilkdropPreset/Waveforms/Line.cpp
+++ b/src/libprojectM/MilkdropPreset/Waveforms/Line.cpp
@@ -1,4 +1,4 @@
-#include "Line.hpp"
+#include "Waveforms/Line.hpp"
 
 #include "PresetState.hpp"
 
diff --git a/src/libprojectM/MilkdropPreset/Waveforms/LineBase.cpp b/src/libprojectM/MilkdropPreset/Waveforms/LineBase.cpp
index c923694e91..8188942fba 100644
--- a/src/libprojectM/MilkdropPreset/Waveforms/LineBase.cpp
+++ b/src/libprojectM/MilkdropPreset/Waveforms/LineBase.cpp
@@ -1,4 +1,4 @@
-#include "LineBase.hpp"
+#include "Waveforms/LineBase.hpp"
 
 #include <Audio/AudioConstants.hpp>
 
diff --git a/src/libprojectM/MilkdropPreset/Waveforms/SpectrumLine.cpp b/src/libprojectM/MilkdropPreset/Waveforms/SpectrumLine.cpp
index 2d7696e3c1..320fc56ccd 100644
--- a/src/libprojectM/MilkdropPreset/Waveforms/SpectrumLine.cpp
+++ b/src/libprojectM/MilkdropPreset/Waveforms/SpectrumLine.cpp
@@ -1,4 +1,4 @@
-#include "SpectrumLine.hpp"
+#include "Waveforms/SpectrumLine.hpp"
 
 #include <cmath>
 
diff --git a/src/libprojectM/PresetFactoryManager.cpp b/src/libprojectM/PresetFactoryManager.cpp
index 7934f8ef4c..6df193aa39 100644
--- a/src/libprojectM/PresetFactoryManager.cpp
+++ b/src/libprojectM/PresetFactoryManager.cpp
@@ -1,11 +1,11 @@
 #include "PresetFactoryManager.hpp"
 
+#include "Utils.hpp"
+
 #include <MilkdropPreset/Factory.hpp>
 
 #include <Logging.hpp>
-#include <Utils.hpp>
 
-#include <algorithm>
 #include <cassert>
 #include <iostream>
 #include <sstream>
diff --git a/src/libprojectM/ProjectM.hpp b/src/libprojectM/ProjectM.hpp
index 1a1c53de89..7b293b45b7 100644
--- a/src/libprojectM/ProjectM.hpp
+++ b/src/libprojectM/ProjectM.hpp
@@ -27,7 +27,6 @@
 #include <Audio/PCM.hpp>
 
 #include <memory>
-#include <set>
 #include <string>
 #include <vector>
 
diff --git a/src/libprojectM/ProjectMCWrapper.cpp b/src/libprojectM/ProjectMCWrapper.cpp
index 839731b7ec..0c89ba64e2 100644
--- a/src/libprojectM/ProjectMCWrapper.cpp
+++ b/src/libprojectM/ProjectMCWrapper.cpp
@@ -6,11 +6,11 @@
 
 #include <Audio/AudioConstants.hpp>
 
-#include <cstring>
 #include <projectM-4/parameters.h>
 #include <projectM-4/render_opengl.h>
-#include <sstream>
 
+#include <cstring>
+#include <sstream>
 
 namespace libprojectM {
 
diff --git a/src/libprojectM/Renderer/CopyTexture.cpp b/src/libprojectM/Renderer/CopyTexture.cpp
index cf6801ba09..14b36c977e 100644
--- a/src/libprojectM/Renderer/CopyTexture.cpp
+++ b/src/libprojectM/Renderer/CopyTexture.cpp
@@ -1,4 +1,4 @@
-#include "CopyTexture.hpp"
+#include "Renderer/CopyTexture.hpp"
 
 namespace libprojectM {
 namespace Renderer {
diff --git a/src/libprojectM/Renderer/Framebuffer.cpp b/src/libprojectM/Renderer/Framebuffer.cpp
index 455cdae4bf..29994d19f4 100644
--- a/src/libprojectM/Renderer/Framebuffer.cpp
+++ b/src/libprojectM/Renderer/Framebuffer.cpp
@@ -1,4 +1,4 @@
-#include "Framebuffer.hpp"
+#include "Renderer/Framebuffer.hpp"
 
 namespace libprojectM {
 namespace Renderer {
diff --git a/src/libprojectM/Renderer/Mesh.cpp b/src/libprojectM/Renderer/Mesh.cpp
index 78a6f23be8..49d000084f 100644
--- a/src/libprojectM/Renderer/Mesh.cpp
+++ b/src/libprojectM/Renderer/Mesh.cpp
@@ -1,4 +1,4 @@
-#include "Mesh.hpp"
+#include "Renderer/Mesh.hpp"
 
 namespace libprojectM {
 namespace Renderer {
diff --git a/src/libprojectM/Renderer/Mesh.hpp b/src/libprojectM/Renderer/Mesh.hpp
index fc9a5cedfe..da636c9cba 100644
--- a/src/libprojectM/Renderer/Mesh.hpp
+++ b/src/libprojectM/Renderer/Mesh.hpp
@@ -1,14 +1,12 @@
 #pragma once
 
-#include "VertexArray.hpp"
-#include "VertexIndexArray.hpp"
-
-
-#include <Renderer/Color.hpp>
-#include <Renderer/Point.hpp>
-#include <Renderer/TextureUV.hpp>
-#include <Renderer/VertexBuffer.hpp>
-#include <Renderer/VertexBufferUsage.hpp>
+#include "Renderer/Color.hpp"
+#include "Renderer/Point.hpp"
+#include "Renderer/TextureUV.hpp"
+#include "Renderer/VertexArray.hpp"
+#include "Renderer/VertexBuffer.hpp"
+#include "Renderer/VertexBufferUsage.hpp"
+#include "Renderer/VertexIndexArray.hpp"
 
 #include <cstdint>
 
diff --git a/src/libprojectM/Renderer/MilkdropNoise.cpp b/src/libprojectM/Renderer/MilkdropNoise.cpp
index bb742d3b0d..bae556454d 100644
--- a/src/libprojectM/Renderer/MilkdropNoise.cpp
+++ b/src/libprojectM/Renderer/MilkdropNoise.cpp
@@ -1,4 +1,4 @@
-#include "MilkdropNoise.hpp"
+#include "Renderer/MilkdropNoise.hpp"
 
 #include "projectM-opengl.h"
 
diff --git a/src/libprojectM/Renderer/PresetTransition.cpp b/src/libprojectM/Renderer/PresetTransition.cpp
index 8fac97a87d..e7060861ea 100644
--- a/src/libprojectM/Renderer/PresetTransition.cpp
+++ b/src/libprojectM/Renderer/PresetTransition.cpp
@@ -1,11 +1,9 @@
-#include "PresetTransition.hpp"
+#include "Renderer/PresetTransition.hpp"
 
-#include "TextureManager.hpp"
+#include "Renderer/TextureManager.hpp"
 
 #include <algorithm>
-#include <array>
 #include <cmath>
-#include <cstddef>
 
 namespace libprojectM {
 namespace Renderer {
diff --git a/src/libprojectM/Renderer/TextureAttachment.cpp b/src/libprojectM/Renderer/TextureAttachment.cpp
index 1c342ad4ae..48515207ea 100644
--- a/src/libprojectM/Renderer/TextureAttachment.cpp
+++ b/src/libprojectM/Renderer/TextureAttachment.cpp
@@ -1,4 +1,4 @@
-#include "TextureAttachment.hpp"
+#include "Renderer/TextureAttachment.hpp"
 
 // OpenGL ES might not define this constant in its headers, e.g. in the iOS and Emscripten SDKs.
 #ifndef GL_STENCIL_INDEX
diff --git a/src/libprojectM/Renderer/TextureManager.cpp b/src/libprojectM/Renderer/TextureManager.cpp
index 24426da54a..a8dc2893d2 100644
--- a/src/libprojectM/Renderer/TextureManager.cpp
+++ b/src/libprojectM/Renderer/TextureManager.cpp
@@ -1,10 +1,11 @@
-#include "TextureManager.hpp"
+#include "Renderer/TextureManager.hpp"
 
-#include "FileScanner.hpp"
-#include "IdleTextures.hpp"
-#include "MilkdropNoise.hpp"
-#include "Texture.hpp"
-#include "Utils.hpp"
+#include "Renderer/FileScanner.hpp"
+#include "Renderer/IdleTextures.hpp"
+#include "Renderer/MilkdropNoise.hpp"
+#include "Renderer/Texture.hpp"
+
+#include <Utils.hpp>
 
 #include <Logging.hpp>
 #include <SOIL2/SOIL2.h>
diff --git a/src/libprojectM/Renderer/TextureSamplerDescriptor.cpp b/src/libprojectM/Renderer/TextureSamplerDescriptor.cpp
index 25efe8e392..d935677923 100644
--- a/src/libprojectM/Renderer/TextureSamplerDescriptor.cpp
+++ b/src/libprojectM/Renderer/TextureSamplerDescriptor.cpp
@@ -1,6 +1,6 @@
-#include "TextureSamplerDescriptor.hpp"
+#include "Renderer/TextureSamplerDescriptor.hpp"
 
-#include "TextureManager.hpp"
+#include "Renderer/TextureManager.hpp"
 
 #include <utility>
 
diff --git a/src/libprojectM/Renderer/TransitionShaderManager.cpp b/src/libprojectM/Renderer/TransitionShaderManager.cpp
index 28ea1fbc2e..638e3c8415 100644
--- a/src/libprojectM/Renderer/TransitionShaderManager.cpp
+++ b/src/libprojectM/Renderer/TransitionShaderManager.cpp
@@ -1,9 +1,7 @@
-#include "TransitionShaderManager.hpp"
+#include "Renderer/TransitionShaderManager.hpp"
 
 #include "BuiltInTransitionsResources.hpp"
 
-#include <iostream>
-
 namespace libprojectM {
 namespace Renderer {
 
diff --git a/src/libprojectM/Renderer/VertexArray.hpp b/src/libprojectM/Renderer/VertexArray.hpp
index 997690b2fd..987c47c3af 100644
--- a/src/libprojectM/Renderer/VertexArray.hpp
+++ b/src/libprojectM/Renderer/VertexArray.hpp
@@ -1,8 +1,5 @@
 #pragma once
 
-#include "VertexBuffer.hpp"
-
-
 #include <projectM-opengl.h>
 
 namespace libprojectM {
diff --git a/src/libprojectM/Renderer/VertexIndexArray.cpp b/src/libprojectM/Renderer/VertexIndexArray.cpp
index 382b80147a..8e3bdd583f 100644
--- a/src/libprojectM/Renderer/VertexIndexArray.cpp
+++ b/src/libprojectM/Renderer/VertexIndexArray.cpp
@@ -1,4 +1,4 @@
-#include "VertexIndexArray.hpp"
+#include "Renderer/VertexIndexArray.hpp"
 
 namespace libprojectM {
 namespace Renderer {
diff --git a/src/libprojectM/UserSprites/MilkdropSprite.cpp b/src/libprojectM/UserSprites/MilkdropSprite.cpp
index aa5c4bf49b..0d4a0304f9 100644
--- a/src/libprojectM/UserSprites/MilkdropSprite.cpp
+++ b/src/libprojectM/UserSprites/MilkdropSprite.cpp
@@ -1,6 +1,7 @@
 #include "UserSprites/MilkdropSprite.hpp"
 
-#include "SpriteException.hpp"
+#include "UserSprites/SpriteException.hpp"
+
 #include "SpriteShaders.hpp"
 
 #include <Preset.hpp>

From 4f3d06205305b0ba0ae30e159fb040d885258992 Mon Sep 17 00:00:00 2001
From: Kai Blaschke <kai.blaschke@kb-dev.net>
Date: Fri, 10 Oct 2025 14:48:45 +0200
Subject: [PATCH 2/7] Move PresetFileParser into MilkdropPreset subdir

Makes more sense contextually.
---
 src/libprojectM/CMakeLists.txt                            | 2 --
 src/libprojectM/MilkdropPreset/CMakeLists.txt             | 2 ++
 src/libprojectM/MilkdropPreset/CustomShape.cpp            | 2 +-
 src/libprojectM/MilkdropPreset/CustomShape.hpp            | 2 +-
 src/libprojectM/MilkdropPreset/CustomWaveform.hpp         | 5 ++---
 src/libprojectM/MilkdropPreset/MilkdropPreset.cpp         | 6 +++---
 src/libprojectM/MilkdropPreset/MilkdropPreset.hpp         | 2 +-
 src/libprojectM/{ => MilkdropPreset}/PresetFileParser.cpp | 2 ++
 src/libprojectM/{ => MilkdropPreset}/PresetFileParser.hpp | 2 ++
 src/libprojectM/MilkdropPreset/PresetState.cpp            | 2 +-
 src/libprojectM/MilkdropPreset/PresetState.hpp            | 6 ++----
 src/libprojectM/UserSprites/CMakeLists.txt                | 1 +
 src/libprojectM/UserSprites/MilkdropSprite.cpp            | 5 +++--
 tests/libprojectM/PresetFileParserTest.cpp                | 4 ++--
 14 files changed, 23 insertions(+), 20 deletions(-)
 rename src/libprojectM/{ => MilkdropPreset}/PresetFileParser.cpp (98%)
 rename src/libprojectM/{ => MilkdropPreset}/PresetFileParser.hpp (98%)

diff --git a/src/libprojectM/CMakeLists.txt b/src/libprojectM/CMakeLists.txt
index 8acfb82cff..85cd1609a4 100644
--- a/src/libprojectM/CMakeLists.txt
+++ b/src/libprojectM/CMakeLists.txt
@@ -20,8 +20,6 @@ add_library(projectM_main OBJECT
         PresetFactory.hpp
         PresetFactoryManager.cpp
         PresetFactoryManager.hpp
-        PresetFileParser.cpp
-        PresetFileParser.hpp
         ProjectM.cpp
         ProjectM.hpp
         ProjectMCWrapper.cpp
diff --git a/src/libprojectM/MilkdropPreset/CMakeLists.txt b/src/libprojectM/MilkdropPreset/CMakeLists.txt
index 68851e548c..6889d8ad2f 100644
--- a/src/libprojectM/MilkdropPreset/CMakeLists.txt
+++ b/src/libprojectM/MilkdropPreset/CMakeLists.txt
@@ -72,6 +72,8 @@ add_library(MilkdropPreset OBJECT
         PerPixelContext.hpp
         PerPixelMesh.cpp
         PerPixelMesh.hpp
+        PresetFileParser.cpp
+        PresetFileParser.hpp
         PresetState.cpp
         PresetState.hpp
         ShapePerFrameContext.cpp
diff --git a/src/libprojectM/MilkdropPreset/CustomShape.cpp b/src/libprojectM/MilkdropPreset/CustomShape.cpp
index 4f9a0f3acf..1acbeb2395 100644
--- a/src/libprojectM/MilkdropPreset/CustomShape.cpp
+++ b/src/libprojectM/MilkdropPreset/CustomShape.cpp
@@ -25,7 +25,7 @@ CustomShape::CustomShape(PresetState& presetState)
     m_perFrameContext.RegisterBuiltinVariables();
 }
 
-void CustomShape::Initialize(::libprojectM::PresetFileParser& parsedFile, int index)
+void CustomShape::Initialize(PresetFileParser& parsedFile, int index)
 {
     std::string const shapecodePrefix = "shapecode_" + std::to_string(index) + "_";
 
diff --git a/src/libprojectM/MilkdropPreset/CustomShape.hpp b/src/libprojectM/MilkdropPreset/CustomShape.hpp
index 326790b2af..5090b37eb7 100644
--- a/src/libprojectM/MilkdropPreset/CustomShape.hpp
+++ b/src/libprojectM/MilkdropPreset/CustomShape.hpp
@@ -31,7 +31,7 @@ class CustomShape
      * @param parsedFile The file parser with the preset data.
      * @param index The waveform index.
      */
-    void Initialize(::libprojectM::PresetFileParser& parsedFile, int index);
+    void Initialize(PresetFileParser& parsedFile, int index);
 
     /**
      * @brief Compiles all code blocks and runs the init expression.
diff --git a/src/libprojectM/MilkdropPreset/CustomWaveform.hpp b/src/libprojectM/MilkdropPreset/CustomWaveform.hpp
index 7e16d6afce..7c4c3df1a2 100644
--- a/src/libprojectM/MilkdropPreset/CustomWaveform.hpp
+++ b/src/libprojectM/MilkdropPreset/CustomWaveform.hpp
@@ -10,11 +10,10 @@
 #include <vector>
 
 namespace libprojectM {
+namespace MilkdropPreset {
 
 class PresetFileParser;
 
-namespace MilkdropPreset {
-
 class CustomWaveform
 {
 public:
@@ -30,7 +29,7 @@ class CustomWaveform
      * @param parsedFile The file parser with the preset data.
      * @param index The waveform index.
      */
-    void Initialize(::libprojectM::PresetFileParser& parsedFile, int index);
+    void Initialize(PresetFileParser& parsedFile, int index);
 
     /**
      * @brief Compiles all code blocks and runs the init expression.
diff --git a/src/libprojectM/MilkdropPreset/MilkdropPreset.cpp b/src/libprojectM/MilkdropPreset/MilkdropPreset.cpp
index 81a9309681..ef1716115b 100755
--- a/src/libprojectM/MilkdropPreset/MilkdropPreset.cpp
+++ b/src/libprojectM/MilkdropPreset/MilkdropPreset.cpp
@@ -207,7 +207,7 @@ void MilkdropPreset::Load(const std::string& pathname)
 
     SetFilename(ParseFilename(pathname));
 
-    ::libprojectM::PresetFileParser parser;
+    PresetFileParser parser;
 
     if (!parser.Read(pathname))
     {
@@ -223,7 +223,7 @@ void MilkdropPreset::Load(std::istream& stream)
 {
     LOG_DEBUG("[MilkdropPreset] Loading preset from stream.");
 
-    ::libprojectM::PresetFileParser parser;
+    PresetFileParser parser;
 
     if (!parser.Read(stream))
     {
@@ -235,7 +235,7 @@ void MilkdropPreset::Load(std::istream& stream)
     InitializePreset(parser);
 }
 
-void MilkdropPreset::InitializePreset(::libprojectM::PresetFileParser& parsedFile)
+void MilkdropPreset::InitializePreset(PresetFileParser& parsedFile)
 {
     // Create the offscreen rendering surfaces.
     m_motionVectorUVMap = std::make_shared<Renderer::TextureAttachment>(GL_RG16F, GL_RG, GL_FLOAT, 0, 0);
diff --git a/src/libprojectM/MilkdropPreset/MilkdropPreset.hpp b/src/libprojectM/MilkdropPreset/MilkdropPreset.hpp
index c1f0ab17de..db8eb43ba4 100644
--- a/src/libprojectM/MilkdropPreset/MilkdropPreset.hpp
+++ b/src/libprojectM/MilkdropPreset/MilkdropPreset.hpp
@@ -93,7 +93,7 @@ class MilkdropPreset : public ::libprojectM::Preset
 
     void Load(std::istream& stream);
 
-    void InitializePreset(::libprojectM::PresetFileParser& parsedFile);
+    void InitializePreset(PresetFileParser& parsedFile);
 
     void CompileCodeAndRunInitExpressions();
 
diff --git a/src/libprojectM/PresetFileParser.cpp b/src/libprojectM/MilkdropPreset/PresetFileParser.cpp
similarity index 98%
rename from src/libprojectM/PresetFileParser.cpp
rename to src/libprojectM/MilkdropPreset/PresetFileParser.cpp
index a48edea775..8be613d86b 100644
--- a/src/libprojectM/PresetFileParser.cpp
+++ b/src/libprojectM/MilkdropPreset/PresetFileParser.cpp
@@ -6,6 +6,7 @@
 #include <vector>
 
 namespace libprojectM {
+namespace MilkdropPreset {
 
 auto PresetFileParser::Read(const std::string& presetFile) -> bool
 {
@@ -191,4 +192,5 @@ auto PresetFileParser::ToLower(std::string str) -> std::string
     return str;
 }
 
+} // namespace MilkdropPreset
 } // namespace libprojectM
diff --git a/src/libprojectM/PresetFileParser.hpp b/src/libprojectM/MilkdropPreset/PresetFileParser.hpp
similarity index 98%
rename from src/libprojectM/PresetFileParser.hpp
rename to src/libprojectM/MilkdropPreset/PresetFileParser.hpp
index 8f2a3afc73..d8925d3ace 100644
--- a/src/libprojectM/PresetFileParser.hpp
+++ b/src/libprojectM/MilkdropPreset/PresetFileParser.hpp
@@ -4,6 +4,7 @@
 #include <string>
 
 namespace libprojectM {
+namespace MilkdropPreset {
 
 /**
  * @brief Milkdrop preset file parser
@@ -128,4 +129,5 @@ class PresetFileParser
     ValueMap m_presetValues; //!< Map with preset keys and their value.
 };
 
+} // namespace MilkdropPreset
 } // namespace libprojectM
diff --git a/src/libprojectM/MilkdropPreset/PresetState.cpp b/src/libprojectM/MilkdropPreset/PresetState.cpp
index 0913ac3775..72c0f61ca8 100644
--- a/src/libprojectM/MilkdropPreset/PresetState.cpp
+++ b/src/libprojectM/MilkdropPreset/PresetState.cpp
@@ -33,7 +33,7 @@ PresetState::~PresetState()
     projectm_eval_memory_buffer_destroy(globalMemory);
 }
 
-void PresetState::Initialize(::libprojectM::PresetFileParser& parsedFile)
+void PresetState::Initialize(PresetFileParser& parsedFile)
 {
 
     // General:
diff --git a/src/libprojectM/MilkdropPreset/PresetState.hpp b/src/libprojectM/MilkdropPreset/PresetState.hpp
index 68fef489d0..57b5faecf8 100644
--- a/src/libprojectM/MilkdropPreset/PresetState.hpp
+++ b/src/libprojectM/MilkdropPreset/PresetState.hpp
@@ -20,11 +20,9 @@
 #include <string>
 
 namespace libprojectM {
-
-class PresetFileParser;
-
 namespace MilkdropPreset {
 
+class PresetFileParser;
 
 using BlendableFloat = float; //!< Currently a placeholder to mark blendable values.
 
@@ -45,7 +43,7 @@ class PresetState
      * @brief Loads the initial values and code from the preset file.
      * @param parsedFile The file parser with the preset data.
      */
-    void Initialize(::libprojectM::PresetFileParser& parsedFile);
+    void Initialize(PresetFileParser& parsedFile);
 
     /**
      * @brief Loads or compiles the generic shaders.
diff --git a/src/libprojectM/UserSprites/CMakeLists.txt b/src/libprojectM/UserSprites/CMakeLists.txt
index cdd4e0894f..ba0ea14b1f 100644
--- a/src/libprojectM/UserSprites/CMakeLists.txt
+++ b/src/libprojectM/UserSprites/CMakeLists.txt
@@ -33,6 +33,7 @@ target_link_libraries(UserSprites
         projectM::Eval
         libprojectM::API # For export header
         PUBLIC
+        MilkdropPreset
         GLM::GLM
         ${PROJECTM_OPENGL_LIBRARIES}
         )
diff --git a/src/libprojectM/UserSprites/MilkdropSprite.cpp b/src/libprojectM/UserSprites/MilkdropSprite.cpp
index 0d4a0304f9..7a8af5cb9e 100644
--- a/src/libprojectM/UserSprites/MilkdropSprite.cpp
+++ b/src/libprojectM/UserSprites/MilkdropSprite.cpp
@@ -4,8 +4,9 @@
 
 #include "SpriteShaders.hpp"
 
+#include <MilkdropPreset/PresetFileParser.hpp>
+
 #include <Preset.hpp>
-#include <PresetFileParser.hpp>
 
 #include <Renderer/BlendMode.hpp>
 #include <Renderer/ShaderCache.hpp>
@@ -35,7 +36,7 @@ MilkdropSprite::MilkdropSprite()
 
 void MilkdropSprite::Init(const std::string& spriteData, const Renderer::RenderContext& renderContext)
 {
-    PresetFileParser parser;
+    MilkdropPreset::PresetFileParser parser;
     std::stringstream spriteDataStream(spriteData);
     if (!parser.Read(spriteDataStream))
     {
diff --git a/tests/libprojectM/PresetFileParserTest.cpp b/tests/libprojectM/PresetFileParserTest.cpp
index 1c6fc27f60..25cd692010 100644
--- a/tests/libprojectM/PresetFileParserTest.cpp
+++ b/tests/libprojectM/PresetFileParserTest.cpp
@@ -1,10 +1,10 @@
 #include <gtest/gtest.h>
 
-#include <PresetFileParser.hpp>
+#include <MilkdropPreset/PresetFileParser.hpp>
 
 static constexpr auto fileParserTestDataPath{ PROJECTM_TEST_DATA_DIR "/PresetFileParser/" };
 
-using libprojectM::PresetFileParser;
+using libprojectM::MilkdropPreset::PresetFileParser;
 
 /**
  * Class to make protected function accessible to tests.

From 49410adca735d90f07b3fcba708ac9462da66560 Mon Sep 17 00:00:00 2001
From: Kai Blaschke <kai.blaschke@kb-dev.net>
Date: Sat, 11 Oct 2025 13:45:37 +0200
Subject: [PATCH 3/7] Move projectM-opengl.h into Renderer lib

---
 src/libprojectM/CMakeLists.txt                |  1 -
 .../MilkdropStaticShaders.cpp.in              |  2 +-
 src/libprojectM/MilkdropPreset/Waveform.cpp   |  2 +-
 src/libprojectM/Renderer/BlendMode.hpp        |  2 +-
 src/libprojectM/Renderer/CMakeLists.txt       |  1 +
 src/libprojectM/Renderer/Color.hpp            |  4 +-
 src/libprojectM/Renderer/MilkdropNoise.cpp    |  2 +-
 src/libprojectM/Renderer/OpenGL.h             | 34 ++++++++++++++++
 src/libprojectM/Renderer/Point.hpp            |  2 +-
 src/libprojectM/Renderer/Sampler.hpp          |  2 +-
 src/libprojectM/Renderer/TextureUV.hpp        |  2 +-
 src/libprojectM/Renderer/VertexArray.hpp      |  2 +-
 src/libprojectM/Renderer/VertexBuffer.hpp     |  3 +-
 .../Renderer/VertexBufferUsage.hpp            |  2 +-
 src/libprojectM/Renderer/VertexIndexArray.hpp |  3 +-
 src/libprojectM/projectM-opengl.h             | 40 -------------------
 16 files changed, 48 insertions(+), 56 deletions(-)
 create mode 100644 src/libprojectM/Renderer/OpenGL.h
 delete mode 100644 src/libprojectM/projectM-opengl.h

diff --git a/src/libprojectM/CMakeLists.txt b/src/libprojectM/CMakeLists.txt
index 85cd1609a4..2fc1c3160e 100644
--- a/src/libprojectM/CMakeLists.txt
+++ b/src/libprojectM/CMakeLists.txt
@@ -28,7 +28,6 @@ add_library(projectM_main OBJECT
         TimeKeeper.hpp
         Utils.cpp
         Utils.hpp
-        projectM-opengl.h
         )
 
 target_link_libraries(projectM_main
diff --git a/src/libprojectM/MilkdropPreset/MilkdropStaticShaders.cpp.in b/src/libprojectM/MilkdropPreset/MilkdropStaticShaders.cpp.in
index 973ca85710..61e89b8db9 100644
--- a/src/libprojectM/MilkdropPreset/MilkdropStaticShaders.cpp.in
+++ b/src/libprojectM/MilkdropPreset/MilkdropStaticShaders.cpp.in
@@ -1,6 +1,6 @@
 #include "MilkdropStaticShaders.hpp"
 
-#include <projectM-opengl.h>
+#include <Renderer/OpenGL.h>
 
 #include <cstring>
 #include <stdexcept>
diff --git a/src/libprojectM/MilkdropPreset/Waveform.cpp b/src/libprojectM/MilkdropPreset/Waveform.cpp
index 0277d10c4d..78c3a97b7a 100644
--- a/src/libprojectM/MilkdropPreset/Waveform.cpp
+++ b/src/libprojectM/MilkdropPreset/Waveform.cpp
@@ -7,7 +7,7 @@
 
 #include <Renderer/BlendMode.hpp>
 
-#include <projectM-opengl.h>
+#include <../Renderer/OpenGL.h>
 
 #include <algorithm>
 #include <cmath>
diff --git a/src/libprojectM/Renderer/BlendMode.hpp b/src/libprojectM/Renderer/BlendMode.hpp
index 222b6f0d82..8cabcade88 100644
--- a/src/libprojectM/Renderer/BlendMode.hpp
+++ b/src/libprojectM/Renderer/BlendMode.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <projectM-opengl.h>
+#include <Renderer/OpenGL.h>
 
 namespace libprojectM {
 namespace Renderer {
diff --git a/src/libprojectM/Renderer/CMakeLists.txt b/src/libprojectM/Renderer/CMakeLists.txt
index 491875bf60..5e1f908fa2 100644
--- a/src/libprojectM/Renderer/CMakeLists.txt
+++ b/src/libprojectM/Renderer/CMakeLists.txt
@@ -31,6 +31,7 @@ add_library(Renderer OBJECT
         Mesh.hpp
         MilkdropNoise.cpp
         MilkdropNoise.hpp
+        OpenGL.h
         Point.hpp
         PresetTransition.cpp
         PresetTransition.hpp
diff --git a/src/libprojectM/Renderer/Color.hpp b/src/libprojectM/Renderer/Color.hpp
index aaf10057b1..089f8e318a 100644
--- a/src/libprojectM/Renderer/Color.hpp
+++ b/src/libprojectM/Renderer/Color.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <projectM-opengl.h>
+#include "Renderer/OpenGL.h"
 
-#include <cstdint>
 #include <cmath>
+#include <cstdint>
 
 namespace libprojectM {
 namespace Renderer {
diff --git a/src/libprojectM/Renderer/MilkdropNoise.cpp b/src/libprojectM/Renderer/MilkdropNoise.cpp
index bae556454d..f76d042297 100644
--- a/src/libprojectM/Renderer/MilkdropNoise.cpp
+++ b/src/libprojectM/Renderer/MilkdropNoise.cpp
@@ -1,6 +1,6 @@
 #include "Renderer/MilkdropNoise.hpp"
 
-#include "projectM-opengl.h"
+#include "Renderer/OpenGL.h"
 
 #include <chrono>
 #include <random>
diff --git a/src/libprojectM/Renderer/OpenGL.h b/src/libprojectM/Renderer/OpenGL.h
new file mode 100644
index 0000000000..b479c46734
--- /dev/null
+++ b/src/libprojectM/Renderer/OpenGL.h
@@ -0,0 +1,34 @@
+/**
+ * @file OpenGL.h
+ * @brief Includes the appropriate OpenGL headers for each platform.
+ */
+#pragma once
+
+#ifdef __APPLE__ /* macOS */
+#include <OpenGL/gl3.h>
+#include <OpenGL/gl3ext.h>
+#elif defined(EYETUNE_WINRT) /* Universal Windows Platform */
+#define GL_GLEXT_PROTOTYPES
+#define GLM_FORCE_CXX03
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+#include <GLES3/gl3.h>
+#include <GLES3/gl31.h>
+#elif defined(_WIN32) /* Windows Desktop */
+#define GLM_FORCE_CXX03
+#include <GL/glew.h>
+#include <GL/wglew.h>
+#include <windows.h>
+#else /* Linux, BSD, Android, emscripten etc. */
+#ifdef USE_GLES
+#include <GLES3/gl3.h>
+#else
+#if !defined(GL_GLEXT_PROTOTYPES)
+#define GL_GLEXT_PROTOTYPES
+#endif
+#include <GL/gl.h>
+#include <GL/glext.h>
+#endif
+#endif
diff --git a/src/libprojectM/Renderer/Point.hpp b/src/libprojectM/Renderer/Point.hpp
index 7d3c074821..66c80f3b79 100644
--- a/src/libprojectM/Renderer/Point.hpp
+++ b/src/libprojectM/Renderer/Point.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <projectM-opengl.h>
+#include "Renderer/OpenGL.h"
 
 #include <cstdint>
 
diff --git a/src/libprojectM/Renderer/Sampler.hpp b/src/libprojectM/Renderer/Sampler.hpp
index a78a3d1f29..4f4c26eea4 100644
--- a/src/libprojectM/Renderer/Sampler.hpp
+++ b/src/libprojectM/Renderer/Sampler.hpp
@@ -4,7 +4,7 @@
 */
 #pragma once
 
-#include <projectM-opengl.h>
+#include <Renderer/OpenGL.h>
 
 #include <memory>
 
diff --git a/src/libprojectM/Renderer/TextureUV.hpp b/src/libprojectM/Renderer/TextureUV.hpp
index 677188ef92..87fad818dd 100644
--- a/src/libprojectM/Renderer/TextureUV.hpp
+++ b/src/libprojectM/Renderer/TextureUV.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <projectM-opengl.h>
+#include "Renderer/OpenGL.h"
 
 #include <cstdint>
 
diff --git a/src/libprojectM/Renderer/VertexArray.hpp b/src/libprojectM/Renderer/VertexArray.hpp
index 987c47c3af..df2b623530 100644
--- a/src/libprojectM/Renderer/VertexArray.hpp
+++ b/src/libprojectM/Renderer/VertexArray.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <projectM-opengl.h>
+#include "Renderer/OpenGL.h"
 
 namespace libprojectM {
 namespace Renderer {
diff --git a/src/libprojectM/Renderer/VertexBuffer.hpp b/src/libprojectM/Renderer/VertexBuffer.hpp
index ef6a62fe8e..62788bfc9e 100644
--- a/src/libprojectM/Renderer/VertexBuffer.hpp
+++ b/src/libprojectM/Renderer/VertexBuffer.hpp
@@ -1,9 +1,8 @@
 #pragma once
 
+#include "Renderer/OpenGL.h"
 #include "Renderer/VertexBufferUsage.hpp"
 
-#include <projectM-opengl.h>
-
 #include <cstddef>
 #include <vector>
 
diff --git a/src/libprojectM/Renderer/VertexBufferUsage.hpp b/src/libprojectM/Renderer/VertexBufferUsage.hpp
index 4dc01755be..35b5d7c0eb 100644
--- a/src/libprojectM/Renderer/VertexBufferUsage.hpp
+++ b/src/libprojectM/Renderer/VertexBufferUsage.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <projectM-opengl.h>
+#include "Renderer/OpenGL.h"
 
 namespace libprojectM {
 namespace Renderer {
diff --git a/src/libprojectM/Renderer/VertexIndexArray.hpp b/src/libprojectM/Renderer/VertexIndexArray.hpp
index 00a515f7ad..569970567a 100644
--- a/src/libprojectM/Renderer/VertexIndexArray.hpp
+++ b/src/libprojectM/Renderer/VertexIndexArray.hpp
@@ -1,9 +1,8 @@
 #pragma once
 
+#include "Renderer/OpenGL.h"
 #include "Renderer/VertexBufferUsage.hpp"
 
-#include <projectM-opengl.h>
-
 #include <cstddef>
 #include <cstdint>
 #include <vector>
diff --git a/src/libprojectM/projectM-opengl.h b/src/libprojectM/projectM-opengl.h
deleted file mode 100644
index 8a605ca2ff..0000000000
--- a/src/libprojectM/projectM-opengl.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
-   Include appropriate OpenGL headers for this platform.
-**/
-
-#pragma once
-
-// Enable openGL extra checks, better not be enabled in release build
-#define OGL_DEBUG 0
-
-// Unlock FPS for rendering benchmarks, it disables Vblank/Vsync and prints drawn frame count within a 5s test run
-#define UNLOCK_FPS 0
-
-#ifdef __APPLE__
-# include <OpenGL/gl3.h>
-# include <OpenGL/gl3ext.h>
-#elif defined(EYETUNE_WINRT)
-# define GL_GLEXT_PROTOTYPES
-# define GLM_FORCE_CXX03
-# include <GLES3/gl31.h>
-# include <GLES3/gl3.h>
-# include <GLES2/gl2.h>
-# include <GLES2/gl2ext.h>
-# include <EGL/egl.h>
-# include <EGL/eglext.h>
-#elif defined(_WIN32)
-# define GLM_FORCE_CXX03
-# include <windows.h>
-# include <GL/glew.h>
-# include <GL/wglew.h>
-#else /* linux/unix/other */
-# ifdef USE_GLES
-#  include <GLES3/gl3.h>
-# else
-#  if !defined(GL_GLEXT_PROTOTYPES)
-#     define GL_GLEXT_PROTOTYPES
-#  endif
-#  include <GL/gl.h>
-#  include <GL/glext.h>
-# endif
-#endif

From 7c2b14e07487976d227a3b9076d9d4c0b5b8dd06 Mon Sep 17 00:00:00 2001
From: Kai Blaschke <kai.blaschke@kb-dev.net>
Date: Wed, 10 Dec 2025 22:15:32 +0100
Subject: [PATCH 4/7] Windows GHA workflow: Pre-fetch NuGet.exe to avoid error

vcpkg will emit additional logging output if no NuGet.exe is installed, which will then make the pwsh command replacement fail as not just the executable location is echoed.
---
 .github/workflows/build_windows.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
index 1a0f352bf4..b0682b3961 100644
--- a/.github/workflows/build_windows.yml
+++ b/.github/workflows/build_windows.yml
@@ -38,7 +38,9 @@ jobs:
 
       - name: Bootstrap vcpkg
         shell: pwsh
-        run: ${{ github.workspace }}/vcpkg/bootstrap-vcpkg.bat
+        run: |
+          ${{ github.workspace }}/vcpkg/bootstrap-vcpkg.bat
+          ${{ env.VCPKG_EXE }} fetch nuget
 
       - name: Add NuGet sources
         shell: pwsh

From 0b4393f3eaf2c4a408a7e52266aec3fad074c1bf Mon Sep 17 00:00:00 2001
From: Kai Blaschke <kai.blaschke@kb-dev.net>
Date: Wed, 10 Dec 2025 22:23:48 +0100
Subject: [PATCH 5/7] Fix shared lib and boost flags in Windows GHA workflows

Before, it was always built with boost and as shared libs.
---
 .github/workflows/build_windows.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
index b0682b3961..a6557ef484 100644
--- a/.github/workflows/build_windows.yml
+++ b/.github/workflows/build_windows.yml
@@ -66,12 +66,12 @@ jobs:
           if("${{ matrix.libs }}" -eq "shared") {
             $shared_libs = "ON"
           } else {
-            $shared_libs = "ON"
+            $shared_libs = "OFF"
           }
           if("${{ matrix.fslib }}" -eq "boost") {
             $use_boost = "ON"
           } else {
-            $use_boost = "ON"
+            $use_boost = "OFF"
           }
           if("${{ matrix.arch }}" -eq "X64") {
             $triplet = "x64-windows"

From cd8b80404608c783b931526c7feddb31081630f6 Mon Sep 17 00:00:00 2001
From: LordMZTE <lord@mzte.de>
Date: Fri, 12 Dec 2025 18:45:36 +0100
Subject: [PATCH 6/7] Fix upper limit of per-pixel mesh dimensions from 400 to
 300

---
 src/libprojectM/ProjectM.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libprojectM/ProjectM.cpp b/src/libprojectM/ProjectM.cpp
index 4c6a702370..552c1e071e 100644
--- a/src/libprojectM/ProjectM.cpp
+++ b/src/libprojectM/ProjectM.cpp
@@ -493,8 +493,8 @@ void ProjectM::SetMeshSize(uint32_t meshResolutionX, uint32_t meshResolutionY)
     }
 
     // Constrain per-pixel mesh size to sensible limits
-    m_meshX = std::max(8u, std::min(400u, m_meshX));
-    m_meshY = std::max(8u, std::min(400u, m_meshY));
+    m_meshX = std::max(8u, std::min(300u, m_meshX));
+    m_meshY = std::max(8u, std::min(300u, m_meshY));
 }
 
 void ProjectM::TexelOffsets(float& texelOffsetX, float& texelOffsetY) const

From f06cbf95a159267b5388479bab05cea481a86453 Mon Sep 17 00:00:00 2001
From: LordMZTE <lord@mzte.de>
Date: Fri, 12 Dec 2025 19:00:24 +0100
Subject: [PATCH 7/7] Add default values of all parameters to Doxygen comments.

Also added a note that projectm_set_window_size() needs to be called once with non-zero size arguments to initiate any rendering.
---
 src/api/include/projectM-4/parameters.h | 37 +++++++++++++------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/api/include/projectM-4/parameters.h b/src/api/include/projectM-4/parameters.h
index 3885a3d754..e090576f87 100644
--- a/src/api/include/projectM-4/parameters.h
+++ b/src/api/include/projectM-4/parameters.h
@@ -64,7 +64,7 @@ PROJECTM_EXPORT void projectm_set_texture_search_paths(projectm_handle instance,
  * If using this feature, it is further recommended to set the time to 0.0 on the first frame.
  *
  * @param instance The projectM instance handle.
- * @param seconds_since_first_frame Any value >= 0 to use user-specified timestamps, values < 0 will use the system clock.
+ * @param seconds_since_first_frame Any value >= 0 to use user-specified timestamps, values < 0 will use the system clock. Default: -1.0
  * @since 4.2.0
  */
 PROJECTM_EXPORT void projectm_set_frame_time(projectm_handle instance, double seconds_since_first_frame);
@@ -87,7 +87,7 @@ PROJECTM_EXPORT double projectm_get_last_frame_time(projectm_handle instance);
  * The beat sensitivity to be used.
  *
  * @param instance The projectM instance handle.
- * @param sensitivity The sensitivity setting.
+ * @param sensitivity The sensitivity setting. Default: 1.0
  * @since 4.0.0
  */
 PROJECTM_EXPORT void projectm_set_beat_sensitivity(projectm_handle instance, float sensitivity);
@@ -109,7 +109,7 @@ PROJECTM_EXPORT float projectm_get_beat_sensitivity(projectm_handle instance);
  * <p>Set this to a higher value than preset duration to disable hard cuts.</p>
  *
  * @param instance The projectM instance handle.
- * @param seconds Minimum number of seconds the preset will be displayed before a hard cut.
+ * @param seconds Minimum number of seconds the preset will be displayed before a hard cut. Default: 20.0
  * @since 4.0.0
  */
 PROJECTM_EXPORT void projectm_set_hard_cut_duration(projectm_handle instance, double seconds);
@@ -129,7 +129,7 @@ PROJECTM_EXPORT double projectm_get_hard_cut_duration(projectm_handle instance);
  * to work properly.
  *
  * @param instance The projectM instance handle.
- * @param enabled True to enable hard cuts, false to disable.
+ * @param enabled True to enable hard cuts, false to disable. Default: false
  * @since 4.0.0
  */
 PROJECTM_EXPORT void projectm_set_hard_cut_enabled(projectm_handle instance, bool enabled);
@@ -148,7 +148,7 @@ PROJECTM_EXPORT bool projectm_get_hard_cut_enabled(projectm_handle instance);
  * The beat detection volume difference that must be surpassed to trigger a hard cut.
  *
  * @param instance The projectM instance handle.
- * @param sensitivity The volume threshold that triggers a hard cut if surpassed.
+ * @param sensitivity The volume threshold that triggers a hard cut if surpassed. Default: 2.0
  * @since 4.0.0
  */
 PROJECTM_EXPORT void projectm_set_hard_cut_sensitivity(projectm_handle instance, float sensitivity);
@@ -168,7 +168,7 @@ PROJECTM_EXPORT float projectm_get_hard_cut_sensitivity(projectm_handle instance
  * to the other.
  *
  * @param instance The projectM instance handle.
- * @param seconds Time in seconds it takes to smoothly transition from one preset to another.
+ * @param seconds Time in seconds it takes to smoothly transition from one preset to another. Default: 3.0
  * @since 4.0.0
  */
 PROJECTM_EXPORT void projectm_set_soft_cut_duration(projectm_handle instance, double seconds);
@@ -188,7 +188,7 @@ PROJECTM_EXPORT double projectm_get_soft_cut_duration(projectm_handle instance);
  * a smooth cut will be initiated. A hard cut, if any, will always happen before this time.
  *
  * @param instance The projectM instance handle.
- * @param seconds The number of seconds a preset will be displayed before the next is shown.
+ * @param seconds The number of seconds a preset will be displayed before the next is shown. Default: 30.0
  * @since 4.0.0
  */
 PROJECTM_EXPORT void projectm_set_preset_duration(projectm_handle instance, double seconds);
@@ -212,8 +212,8 @@ PROJECTM_EXPORT double projectm_get_preset_duration(projectm_handle instance);
  * so only multiples of two are used.
  *
  * @param instance The projectM instance handle.
- * @param width The new width of the mesh.
- * @param height The new height of the mesh.
+ * @param width The new width of the mesh. Default: 32
+ * @param height The new height of the mesh. Default: 24
  * @since 4.0.0
  */
 PROJECTM_EXPORT void projectm_set_mesh_size(projectm_handle instance, size_t width, size_t height);
@@ -235,8 +235,8 @@ PROJECTM_EXPORT void projectm_get_mesh_size(projectm_handle instance, size_t* wi
  * be configured externally to fix any possible drift.
  *
  * @param instance The projectM instance handle.
- * @param offset_X The offset in texels in the horizontal direction. Milkdrop uses 0.5, default in projectM is 0.0.
- * @param offset_y The offset in texels in the vertical direction. Milkdrop uses 0.5, default in projectM is 0.0.
+ * @param offset_X The offset in texels in the horizontal direction. Milkdrop uses 0.5. Default: 0.0
+ * @param offset_y The offset in texels in the vertical direction. Milkdrop uses 0.5. Default: 0.0
  * @since 4.2.0
  */
 PROJECTM_EXPORT void projectm_set_texel_offset(projectm_handle instance, float offset_X, float offset_y);
@@ -263,7 +263,7 @@ PROJECTM_EXPORT void projectm_get_texel_offset(projectm_handle instance, float*
  * which may choose to use it for calculations. It is not used in any other way by the library.
  *
  * @param instance The projectM instance handle.
- * @param fps The current FPS value projectM is running with.
+ * @param fps The current FPS value projectM is running with. Default: 35
  * @since 4.0.0
  */
 PROJECTM_EXPORT void projectm_set_fps(projectm_handle instance, int32_t fps);
@@ -286,7 +286,7 @@ PROJECTM_EXPORT int32_t projectm_get_fps(projectm_handle instance);
  * be distorted if the viewport isn't exactly square.
  *
  * @param instance The projectM instance handle.
- * @param enabled True to enable aspect correction, false to disable it.
+ * @param enabled True to enable aspect correction, false to disable it. Default: true
  * @since 4.0.0
  */
 PROJECTM_EXPORT void projectm_set_aspect_correction(projectm_handle instance, bool enabled);
@@ -309,7 +309,7 @@ PROJECTM_EXPORT bool projectm_get_aspect_correction(projectm_handle instance);
  * <p>See function sampledPresetDuration() of the TimeKeeper class on how it is used.</p>
  *
  * @param instance The projectM instance handle.
- * @param value The new "easter egg" value. Must be greater than zero, otherwise a default sigma value of 1.0 will be used.
+ * @param value The new "easter egg" value. Must be greater than zero, otherwise a default sigma value of 1.0 will be used. Default: 1.0
  * @since 4.0.0
  */
 PROJECTM_EXPORT void projectm_set_easter_egg(projectm_handle instance, float value);
@@ -329,7 +329,7 @@ PROJECTM_EXPORT float projectm_get_easter_egg(projectm_handle instance);
  * preset switches will still be executed.
  *
  * @param instance The projectM instance handle.
- * @param lock True to lock the current preset, false to enable automatic transitions.
+ * @param lock True to lock the current preset, false to enable automatic transitions. Default: false
  * @since 4.0.0
  */
 PROJECTM_EXPORT void projectm_set_preset_locked(projectm_handle instance, bool lock);
@@ -345,6 +345,9 @@ PROJECTM_EXPORT bool projectm_get_preset_locked(projectm_handle instance);
 /**
  * @brief Sets the current viewport size in pixels.
  *
+ * This method must be called with a non-zero size for each dimension for projectM to render
+ * anything. The viewport size should be the same size or smaller as the surface being rendered to.
+ *
  * The internal textures will only be replaced and resized when rendering the next frame and only
  * if any of the two dimensions actually changed.
  *
@@ -352,8 +355,8 @@ PROJECTM_EXPORT bool projectm_get_preset_locked(projectm_handle instance);
  * effects as it only updates the size with the same values.
  *
  * @param instance The projectM instance handle.
- * @param width New viewport width in pixels.
- * @param height New viewport height in pixels.
+ * @param width New viewport width in pixels. Default: 0
+ * @param height New viewport height in pixels. Default: 0
  * @since 4.0.0
  */
 PROJECTM_EXPORT void projectm_set_window_size(projectm_handle instance, size_t width, size_t height);