diff --git a/src/libprojectM/Audio/CMakeLists.txt b/src/libprojectM/Audio/CMakeLists.txt
index c5db70b07..99685b95c 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 f905bb33a..98ed4177a 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 2139c9240..0f8d6371d 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 55f3baf8c..7d453bd29 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 83dfe128d..134f338a1 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 56a7cc65d..bc7c83c59 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 602e2490f..bfda1a423 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 6d59f5aca..a92eea200 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 74b7e616a..9c0950b4f 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 04647a5a8..bfab458fb 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 10dd8c9d9..f5805e4e8 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 b8f8f7eeb..839398ca1 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 e82687ae9..7e16d6afc 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 06fa470bb..c1f0ab17d 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 a19af6512..d9e325a1d 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 4f8165dc7..2997a8208 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 ce19ff47f..2942a7f2f 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 9bd25ba1b..e20acadb2 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 @@ public:
      * 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 f9a51c02b..dda77f114 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 1838269cd..0913ac377 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 5877692f3..e31f5332d 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 93d944697..5e6084aab 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 d9ca7403c..b7052b10e 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 fd6eb0493..a4b919c7b 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 ac0f4067a..158184951 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 ff204e23d..02f954149 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 1a33d6e6f..22d6e1e26 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 a180baaeb..23df85758 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 c923694e9..8188942fb 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 2d7696e3c..320fc56cc 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 7934f8ef4..6df193aa3 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 1a1c53de8..7b293b45b 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 839731b7e..0c89ba64e 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 cf6801ba0..14b36c977 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 455cdae4b..29994d19f 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 78a6f23be..49d000084 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 fc9a5cedf..da636c9cb 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 bb742d3b0..bae556454 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 8fac97a87..e7060861e 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 1c342ad4a..48515207e 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 24426da54..a8dc2893d 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 25efe8e39..d93567792 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 28ea1fbc2..638e3c841 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 997690b2f..987c47c3a 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 382b80147..8e3bdd583 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 aa5c4bf49..0d4a0304f 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>