diff --git a/src/libprojectM/Audio/CMakeLists.txt b/src/libprojectM/Audio/CMakeLists.txt
index e4ca0a713..c5db70b07 100644
--- a/src/libprojectM/Audio/CMakeLists.txt
+++ b/src/libprojectM/Audio/CMakeLists.txt
@@ -3,7 +3,6 @@ add_library(Audio OBJECT
         AudioConstants.hpp
         MilkdropFFT.cpp
         MilkdropFFT.hpp
-        FrameAudioData.cpp
         FrameAudioData.hpp
         PCM.cpp
         PCM.hpp
diff --git a/src/libprojectM/Audio/FrameAudioData.cpp b/src/libprojectM/Audio/FrameAudioData.cpp
deleted file mode 100644
index d245cb177..000000000
--- a/src/libprojectM/Audio/FrameAudioData.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "FrameAudioData.hpp"
-
-namespace libprojectM {
-namespace Audio {
-
-} // namespace Audio
-} // namespace libprojectM
diff --git a/src/libprojectM/Audio/PCM.cpp b/src/libprojectM/Audio/PCM.cpp
index 86e98d159..56a7cc65d 100755
--- a/src/libprojectM/Audio/PCM.cpp
+++ b/src/libprojectM/Audio/PCM.cpp
@@ -1,7 +1,5 @@
 #include "PCM.hpp"
 
-#include <cassert>
-
 namespace libprojectM {
 namespace Audio {
 
diff --git a/src/libprojectM/CMakeLists.txt b/src/libprojectM/CMakeLists.txt
index 3bb883b2b..ec0949ae9 100644
--- a/src/libprojectM/CMakeLists.txt
+++ b/src/libprojectM/CMakeLists.txt
@@ -137,7 +137,7 @@ if(ENABLE_INSTALL)
     else()
         # Set PROJECTM_STATIC_EXPORT for C++ implementations to use project default visibility
         # and no dllimport/dllexport.
-        set_source_files_properties(ProjectM.cpp Audio/PCM.cpp Audio/FrameAudioData.cpp PROPERTIES
+        set_source_files_properties(ProjectM.cpp Audio/PCM.cpp PROPERTIES
                 COMPILE_DEFINITIONS PROJECTM_STATIC_DEFINE
                 )
         target_compile_definitions(projectM
diff --git a/src/libprojectM/MilkdropPreset/BlurTexture.cpp b/src/libprojectM/MilkdropPreset/BlurTexture.cpp
index 637dc2bff..daa1033d2 100644
--- a/src/libprojectM/MilkdropPreset/BlurTexture.cpp
+++ b/src/libprojectM/MilkdropPreset/BlurTexture.cpp
@@ -1,7 +1,6 @@
 #include "BlurTexture.hpp"
 
 #include "PerFrameContext.hpp"
-#include "PresetState.hpp"
 
 #include "MilkdropStaticShaders.hpp"
 
diff --git a/src/libprojectM/MilkdropPreset/Border.cpp b/src/libprojectM/MilkdropPreset/Border.cpp
index e20ff17ba..86c8b0cbe 100644
--- a/src/libprojectM/MilkdropPreset/Border.cpp
+++ b/src/libprojectM/MilkdropPreset/Border.cpp
@@ -1,7 +1,5 @@
 #include "Border.hpp"
 
-#include <glm/gtc/type_ptr.hpp>
-
 namespace libprojectM {
 namespace MilkdropPreset {
 
diff --git a/src/libprojectM/MilkdropPreset/Constants.hpp b/src/libprojectM/MilkdropPreset/Constants.hpp
index 407769678..7662e3767 100644
--- a/src/libprojectM/MilkdropPreset/Constants.hpp
+++ b/src/libprojectM/MilkdropPreset/Constants.hpp
@@ -4,8 +4,6 @@
  */
 #pragma once
 
-#include <Audio/AudioConstants.hpp>
-
 namespace libprojectM {
 namespace MilkdropPreset {
 
diff --git a/src/libprojectM/MilkdropPreset/CustomShape.cpp b/src/libprojectM/MilkdropPreset/CustomShape.cpp
index edbb33355..a4b22bb6c 100644
--- a/src/libprojectM/MilkdropPreset/CustomShape.cpp
+++ b/src/libprojectM/MilkdropPreset/CustomShape.cpp
@@ -2,9 +2,7 @@
 
 #include "PresetFileParser.hpp"
 
-#include "Renderer/TextureManager.hpp"
-
-#include <glm/gtc/type_ptr.hpp>
+#include <Renderer/TextureManager.hpp>
 
 #include <vector>
 
diff --git a/src/libprojectM/MilkdropPreset/CustomShape.hpp b/src/libprojectM/MilkdropPreset/CustomShape.hpp
index 1d75eb77c..5ecb23eb0 100644
--- a/src/libprojectM/MilkdropPreset/CustomShape.hpp
+++ b/src/libprojectM/MilkdropPreset/CustomShape.hpp
@@ -4,7 +4,7 @@
 #include "PresetState.hpp"
 #include "ShapePerFrameContext.hpp"
 
-#include "Renderer/RenderItem.hpp"
+#include <Renderer/RenderItem.hpp>
 
 #include <projectm-eval.h>
 
diff --git a/src/libprojectM/MilkdropPreset/CustomWaveform.cpp b/src/libprojectM/MilkdropPreset/CustomWaveform.cpp
index 810d5b340..ee2e1721f 100644
--- a/src/libprojectM/MilkdropPreset/CustomWaveform.cpp
+++ b/src/libprojectM/MilkdropPreset/CustomWaveform.cpp
@@ -2,13 +2,7 @@
 
 #include "PerFrameContext.hpp"
 #include "PresetFileParser.hpp"
-#include "projectM-opengl.h"
 
-#include <glm/gtc/type_ptr.hpp>
-
-#ifdef _WIN32
-#include <functional>
-#endif /** _WIN32 */
 #include <algorithm>
 #include <cmath>
 
diff --git a/src/libprojectM/MilkdropPreset/CustomWaveform.hpp b/src/libprojectM/MilkdropPreset/CustomWaveform.hpp
index d83d53d24..363c27345 100644
--- a/src/libprojectM/MilkdropPreset/CustomWaveform.hpp
+++ b/src/libprojectM/MilkdropPreset/CustomWaveform.hpp
@@ -3,7 +3,7 @@
 #include "WaveformPerFrameContext.hpp"
 #include "WaveformPerPointContext.hpp"
 
-#include "Renderer/RenderItem.hpp"
+#include <Renderer/RenderItem.hpp>
 
 #include <vector>
 
diff --git a/src/libprojectM/MilkdropPreset/DarkenCenter.hpp b/src/libprojectM/MilkdropPreset/DarkenCenter.hpp
index dd3a4318f..3f04012f7 100644
--- a/src/libprojectM/MilkdropPreset/DarkenCenter.hpp
+++ b/src/libprojectM/MilkdropPreset/DarkenCenter.hpp
@@ -2,7 +2,7 @@
 
 #include "PresetState.hpp"
 
-#include "Renderer/RenderItem.hpp"
+#include <Renderer/RenderItem.hpp>
 
 namespace libprojectM {
 namespace MilkdropPreset {
diff --git a/src/libprojectM/MilkdropPreset/Factory.cpp b/src/libprojectM/MilkdropPreset/Factory.cpp
index 8179e3089..35e16353b 100644
--- a/src/libprojectM/MilkdropPreset/Factory.cpp
+++ b/src/libprojectM/MilkdropPreset/Factory.cpp
@@ -1,15 +1,3 @@
-//
-// C++ Implementation: MilkdropPresetFactory
-//
-// Description:
-//
-//
-// Author: Carmelo Piccione <carmelo.piccione@gmail.com>, (C) 2008
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
-//
 #include "Factory.hpp"
 
 #include "IdlePreset.hpp"
@@ -22,7 +10,7 @@ std::unique_ptr<::libprojectM::Preset> Factory::LoadPresetFromFile(const std::st
 {
     std::string path;
     auto protocol = PresetFactory::Protocol(filename, path);
-    if (protocol == PresetFactory::IDLE_PRESET_PROTOCOL)
+    if (protocol == "idle")
     {
         return IdlePresets::allocate();
     }
diff --git a/src/libprojectM/MilkdropPreset/Filters.cpp b/src/libprojectM/MilkdropPreset/Filters.cpp
index 9a82d63c7..9c70904a1 100644
--- a/src/libprojectM/MilkdropPreset/Filters.cpp
+++ b/src/libprojectM/MilkdropPreset/Filters.cpp
@@ -1,7 +1,5 @@
 #include "Filters.hpp"
 
-#include "projectM-opengl.h"
-
 namespace libprojectM {
 namespace MilkdropPreset {
 
diff --git a/src/libprojectM/MilkdropPreset/FinalComposite.cpp b/src/libprojectM/MilkdropPreset/FinalComposite.cpp
index 109081f6d..72427cb77 100644
--- a/src/libprojectM/MilkdropPreset/FinalComposite.cpp
+++ b/src/libprojectM/MilkdropPreset/FinalComposite.cpp
@@ -4,6 +4,10 @@
 
 #include <cstddef>
 
+#ifdef MILKDROP_PRESET_DEBUG
+#include <iostream>
+#endif
+
 namespace libprojectM {
 namespace MilkdropPreset {
 
diff --git a/src/libprojectM/MilkdropPreset/IdlePreset.cpp b/src/libprojectM/MilkdropPreset/IdlePreset.cpp
index bada4f924..747d4d3f5 100644
--- a/src/libprojectM/MilkdropPreset/IdlePreset.cpp
+++ b/src/libprojectM/MilkdropPreset/IdlePreset.cpp
@@ -1,5 +1,7 @@
 #include "IdlePreset.hpp"
+
 #include "MilkdropPreset.hpp"
+
 #include <sstream>
 #include <string>
 
diff --git a/src/libprojectM/MilkdropPreset/MilkdropShader.hpp b/src/libprojectM/MilkdropPreset/MilkdropShader.hpp
index 5c7bec8ff..4f8165dc7 100644
--- a/src/libprojectM/MilkdropPreset/MilkdropShader.hpp
+++ b/src/libprojectM/MilkdropPreset/MilkdropShader.hpp
@@ -8,8 +8,9 @@
 #pragma once
 
 #include "BlurTexture.hpp"
-#include "Renderer/Shader.hpp"
-#include "Renderer/TextureManager.hpp"
+
+#include <Renderer/Shader.hpp>
+#include <Renderer/TextureManager.hpp>
 
 #include <array>
 #include <set>
diff --git a/src/libprojectM/MilkdropPreset/MilkdropStaticShaders.cpp.in b/src/libprojectM/MilkdropPreset/MilkdropStaticShaders.cpp.in
index 8b1239fc1..8648ed413 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 <projectM-opengl.h>
 
 #include <cstring>
 #include <stdexcept>
diff --git a/src/libprojectM/MilkdropPreset/MilkdropStaticShaders.hpp.in b/src/libprojectM/MilkdropPreset/MilkdropStaticShaders.hpp.in
index c3091865e..5e5942fb7 100644
--- a/src/libprojectM/MilkdropPreset/MilkdropStaticShaders.hpp.in
+++ b/src/libprojectM/MilkdropPreset/MilkdropStaticShaders.hpp.in
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "GLSLGenerator.h"
+#include <GLSLGenerator.h>
 
-#include "Renderer/Shader.hpp"
+#include <Renderer/Shader.hpp>
 
 #include <memory>
 
diff --git a/src/libprojectM/MilkdropPreset/MotionVectors.cpp b/src/libprojectM/MilkdropPreset/MotionVectors.cpp
index 0dcca3261..191c9db5e 100644
--- a/src/libprojectM/MilkdropPreset/MotionVectors.cpp
+++ b/src/libprojectM/MilkdropPreset/MotionVectors.cpp
@@ -1,6 +1,6 @@
 #include "MotionVectors.hpp"
 
-#include <MilkdropStaticShaders.hpp>
+#include "MilkdropStaticShaders.hpp"
 
 #include <Renderer/TextureManager.hpp>
 
diff --git a/src/libprojectM/MilkdropPreset/MotionVectors.hpp b/src/libprojectM/MilkdropPreset/MotionVectors.hpp
index 46bf615cf..5fd825283 100644
--- a/src/libprojectM/MilkdropPreset/MotionVectors.hpp
+++ b/src/libprojectM/MilkdropPreset/MotionVectors.hpp
@@ -3,7 +3,7 @@
 #include "PerFrameContext.hpp"
 #include "PresetState.hpp"
 
-#include "Renderer/RenderItem.hpp"
+#include <Renderer/RenderItem.hpp>
 
 #include <memory>
 
diff --git a/src/libprojectM/MilkdropPreset/PerPixelMesh.cpp b/src/libprojectM/MilkdropPreset/PerPixelMesh.cpp
index 3cbfd93da..724c4b45c 100644
--- a/src/libprojectM/MilkdropPreset/PerPixelMesh.cpp
+++ b/src/libprojectM/MilkdropPreset/PerPixelMesh.cpp
@@ -1,15 +1,18 @@
 #include "PerPixelMesh.hpp"
 
 #include "MilkdropShader.hpp"
+#include "MilkdropStaticShaders.hpp"
 #include "PerFrameContext.hpp"
 #include "PerPixelContext.hpp"
 #include "PresetState.hpp"
 
-#include <MilkdropStaticShaders.hpp>
-
 #include <algorithm>
 #include <cmath>
 
+#ifdef MILKDROP_PRESET_DEBUG
+#include <iostream>
+#endif
+
 namespace libprojectM {
 namespace MilkdropPreset {
 
diff --git a/src/libprojectM/MilkdropPreset/PresetState.cpp b/src/libprojectM/MilkdropPreset/PresetState.cpp
index d5ec11696..7ff872a55 100644
--- a/src/libprojectM/MilkdropPreset/PresetState.cpp
+++ b/src/libprojectM/MilkdropPreset/PresetState.cpp
@@ -1,8 +1,9 @@
 #include "PresetState.hpp"
 
+#include "MilkdropStaticShaders.hpp"
 #include "PresetFileParser.hpp"
 
-#include <MilkdropStaticShaders.hpp>
+#include <glm/gtc/matrix_transform.hpp>
 
 #include <random>
 
diff --git a/src/libprojectM/MilkdropPreset/PresetState.hpp b/src/libprojectM/MilkdropPreset/PresetState.hpp
index dd767527a..bf66b3f1d 100644
--- a/src/libprojectM/MilkdropPreset/PresetState.hpp
+++ b/src/libprojectM/MilkdropPreset/PresetState.hpp
@@ -17,8 +17,6 @@
 
 #include <projectm-eval.h>
 
-#include <glm/gtc/matrix_transform.hpp>
-
 #include <string>
 
 namespace libprojectM {
diff --git a/src/libprojectM/MilkdropPreset/VideoEcho.cpp b/src/libprojectM/MilkdropPreset/VideoEcho.cpp
index e6444bf11..bf7d4af97 100644
--- a/src/libprojectM/MilkdropPreset/VideoEcho.cpp
+++ b/src/libprojectM/MilkdropPreset/VideoEcho.cpp
@@ -1,7 +1,5 @@
 #include "VideoEcho.hpp"
 
-#include <glm/gtc/type_ptr.hpp>
-
 namespace libprojectM {
 namespace MilkdropPreset {
 
diff --git a/src/libprojectM/MilkdropPreset/VideoEcho.hpp b/src/libprojectM/MilkdropPreset/VideoEcho.hpp
index e8f0f2194..dce3cace9 100644
--- a/src/libprojectM/MilkdropPreset/VideoEcho.hpp
+++ b/src/libprojectM/MilkdropPreset/VideoEcho.hpp
@@ -3,7 +3,7 @@
 #include "PerFrameContext.hpp"
 #include "PresetState.hpp"
 
-#include "projectM-opengl.h"
+#include <projectM-opengl.h>
 
 #include <Renderer/RenderItem.hpp>
 
diff --git a/src/libprojectM/MilkdropPreset/Waveform.cpp b/src/libprojectM/MilkdropPreset/Waveform.cpp
index c39ee00bc..477ff6d5a 100644
--- a/src/libprojectM/MilkdropPreset/Waveform.cpp
+++ b/src/libprojectM/MilkdropPreset/Waveform.cpp
@@ -5,9 +5,9 @@
 
 #include "Waveforms/Factory.hpp"
 
-#include "projectM-opengl.h"
+#include <projectM-opengl.h>
 
-#include "Audio/AudioConstants.hpp"
+#include <Audio/AudioConstants.hpp>
 
 #include <algorithm>
 #include <cmath>
diff --git a/src/libprojectM/MilkdropPreset/Waveform.hpp b/src/libprojectM/MilkdropPreset/Waveform.hpp
index 1e2156c38..bad7b944b 100644
--- a/src/libprojectM/MilkdropPreset/Waveform.hpp
+++ b/src/libprojectM/MilkdropPreset/Waveform.hpp
@@ -5,7 +5,7 @@
 
 #include "Waveforms/WaveformMath.hpp"
 
-#include "Renderer/RenderItem.hpp"
+#include <Renderer/RenderItem.hpp>
 
 #include <memory>
 #include <vector>
diff --git a/src/libprojectM/MilkdropPreset/Waveforms/CenteredSpiro.cpp b/src/libprojectM/MilkdropPreset/Waveforms/CenteredSpiro.cpp
index 371cf2daf..a2cfcc778 100644
--- a/src/libprojectM/MilkdropPreset/Waveforms/CenteredSpiro.cpp
+++ b/src/libprojectM/MilkdropPreset/Waveforms/CenteredSpiro.cpp
@@ -1,5 +1,7 @@
 #include "CenteredSpiro.hpp"
 
+#include <Audio/AudioConstants.hpp>
+
 namespace libprojectM {
 namespace MilkdropPreset {
 namespace Waveforms {
diff --git a/src/libprojectM/MilkdropPreset/Waveforms/LineBase.cpp b/src/libprojectM/MilkdropPreset/Waveforms/LineBase.cpp
index 23cb9a638..c923694e9 100644
--- a/src/libprojectM/MilkdropPreset/Waveforms/LineBase.cpp
+++ b/src/libprojectM/MilkdropPreset/Waveforms/LineBase.cpp
@@ -1,5 +1,7 @@
 #include "LineBase.hpp"
 
+#include <Audio/AudioConstants.hpp>
+
 #include <cmath>
 
 namespace libprojectM {
diff --git a/src/libprojectM/Preset.hpp b/src/libprojectM/Preset.hpp
index 35f951140..ba06a14d9 100644
--- a/src/libprojectM/Preset.hpp
+++ b/src/libprojectM/Preset.hpp
@@ -1,10 +1,11 @@
 #pragma once
 
-#include "Audio/FrameAudioData.hpp"
+#include <Audio/FrameAudioData.hpp>
 
-#include "Renderer/RenderContext.hpp"
-#include "Renderer/Texture.hpp"
+#include <Renderer/RenderContext.hpp>
+#include <Renderer/Texture.hpp>
 
+#include <memory>
 #include <string>
 
 namespace libprojectM {
@@ -51,7 +52,7 @@ class Preset
         m_filename = filename;
     }
 
-    inline const std::string& Filename() const
+    inline auto Filename() const -> const std::string&
     {
         return m_filename;
     }
diff --git a/src/libprojectM/PresetFactory.cpp b/src/libprojectM/PresetFactory.cpp
index bc6e2f317..3c56876b2 100644
--- a/src/libprojectM/PresetFactory.cpp
+++ b/src/libprojectM/PresetFactory.cpp
@@ -6,8 +6,6 @@
 
 namespace libprojectM {
 
-const std::string PresetFactory::IDLE_PRESET_PROTOCOL("idle");
-
 std::string PresetFactory::Protocol(const std::string& url, std::string& path)
 {
     auto pos = url.find("://");
diff --git a/src/libprojectM/PresetFactory.hpp b/src/libprojectM/PresetFactory.hpp
index bc5847e7d..15593d392 100644
--- a/src/libprojectM/PresetFactory.hpp
+++ b/src/libprojectM/PresetFactory.hpp
@@ -10,8 +10,6 @@ class PresetFactory
 {
 
 public:
-    static const std::string IDLE_PRESET_PROTOCOL; //!< The string "idle"
-
     PresetFactory() = default;
 
     virtual ~PresetFactory() = default;
diff --git a/src/libprojectM/PresetFactoryManager.cpp b/src/libprojectM/PresetFactoryManager.cpp
index 4d6419d18..d4598af99 100644
--- a/src/libprojectM/PresetFactoryManager.cpp
+++ b/src/libprojectM/PresetFactoryManager.cpp
@@ -1,14 +1,3 @@
-//
-// C++ Implementation: PresetFactoryManager
-//
-// Description:
-//
-//
-// Author: Carmelo Piccione <carmelo.piccione@gmail.com>, (C) 2008
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
 #include "PresetFactoryManager.hpp"
 
 #include <MilkdropPreset/Factory.hpp>
diff --git a/src/libprojectM/ProjectM.cpp b/src/libprojectM/ProjectM.cpp
index 8b0c6545b..3f2dde86f 100644
--- a/src/libprojectM/ProjectM.cpp
+++ b/src/libprojectM/ProjectM.cpp
@@ -25,12 +25,12 @@
 #include "PresetFactoryManager.hpp"
 #include "TimeKeeper.hpp"
 
-#include "Audio/PCM.hpp" //Sound data handler (buffering, FFT, etc.)
+#include <Audio/PCM.hpp>
 
-#include "Renderer/CopyTexture.hpp"
-#include "Renderer/PresetTransition.hpp"
-#include "Renderer/TextureManager.hpp"
-#include "Renderer/TransitionShaderManager.hpp"
+#include <Renderer/CopyTexture.hpp>
+#include <Renderer/PresetTransition.hpp>
+#include <Renderer/TextureManager.hpp>
+#include <Renderer/TransitionShaderManager.hpp>
 
 namespace libprojectM {
 
diff --git a/src/libprojectM/ProjectM.hpp b/src/libprojectM/ProjectM.hpp
index 58291888b..1d465e911 100644
--- a/src/libprojectM/ProjectM.hpp
+++ b/src/libprojectM/ProjectM.hpp
@@ -20,21 +20,11 @@
  */
 #pragma once
 
-#include <Renderer/RenderContext.hpp>
-
-#include "projectM-4/projectM_export.h"
-
-#include "libprojectM/Audio/PCM.hpp"
+#include <projectM-4/projectM_export.h>
 
-#ifdef _WIN32
-
-#ifdef _MSC_VER
-#pragma warning(disable : 4244)
-#pragma warning(disable : 4305)
-#endif /* _MSC_VER */
-#endif /** _WIN32 */
+#include <Renderer/RenderContext.hpp>
 
-#include <sys/types.h>
+#include <Audio/PCM.hpp>
 
 #include <memory>
 #include <string>
diff --git a/src/libprojectM/ProjectMCWrapper.cpp b/src/libprojectM/ProjectMCWrapper.cpp
index f205c5a05..cbf5f6edc 100644
--- a/src/libprojectM/ProjectMCWrapper.cpp
+++ b/src/libprojectM/ProjectMCWrapper.cpp
@@ -1,8 +1,8 @@
 #include "ProjectMCWrapper.hpp"
 
-#include "projectM-4/projectM.h"
+#include <projectM-4/projectM.h>
 
-#include "Audio/AudioConstants.hpp"
+#include <Audio/AudioConstants.hpp>
 
 #include <cstring>
 #include <sstream>
diff --git a/src/libprojectM/ProjectMCWrapper.hpp b/src/libprojectM/ProjectMCWrapper.hpp
index ccca3e33c..38e4cc9af 100644
--- a/src/libprojectM/ProjectMCWrapper.hpp
+++ b/src/libprojectM/ProjectMCWrapper.hpp
@@ -23,7 +23,7 @@
 
 #include "ProjectM.hpp"
 
-#include "projectM-4/projectM.h"
+#include <projectM-4/projectM.h>
 
 namespace libprojectM {
 
diff --git a/src/libprojectM/Renderer/CopyTexture.cpp b/src/libprojectM/Renderer/CopyTexture.cpp
index 860dc5f15..8e8ce336a 100644
--- a/src/libprojectM/Renderer/CopyTexture.cpp
+++ b/src/libprojectM/Renderer/CopyTexture.cpp
@@ -3,7 +3,6 @@
 #include <array>
 #include <iostream>
 
-
 namespace libprojectM {
 namespace Renderer {
 
diff --git a/src/libprojectM/Renderer/Framebuffer.hpp b/src/libprojectM/Renderer/Framebuffer.hpp
index 0d75b9038..25bf28d41 100644
--- a/src/libprojectM/Renderer/Framebuffer.hpp
+++ b/src/libprojectM/Renderer/Framebuffer.hpp
@@ -4,9 +4,7 @@
 */
 #pragma once
 
-#include "TextureAttachment.hpp"
-
-#include "projectM-opengl.h"
+#include "Renderer/TextureAttachment.hpp"
 
 #include <map>
 #include <vector>
diff --git a/src/libprojectM/Renderer/PresetTransition.hpp b/src/libprojectM/Renderer/PresetTransition.hpp
index e5bcb416a..2623324a7 100644
--- a/src/libprojectM/Renderer/PresetTransition.hpp
+++ b/src/libprojectM/Renderer/PresetTransition.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "RenderItem.hpp"
-#include "Shader.hpp"
-#include "TextureSamplerDescriptor.hpp"
+#include "Renderer/RenderItem.hpp"
+#include "Renderer/Shader.hpp"
+#include "Renderer/TextureSamplerDescriptor.hpp"
 
 #include <Preset.hpp>
 
diff --git a/src/libprojectM/Renderer/RenderContext.hpp b/src/libprojectM/Renderer/RenderContext.hpp
index 1a14f5258..a5a1f9c6e 100644
--- a/src/libprojectM/Renderer/RenderContext.hpp
+++ b/src/libprojectM/Renderer/RenderContext.hpp
@@ -4,8 +4,6 @@
 */
 #pragma once
 
-#include "projectM-opengl.h"
-
 namespace libprojectM {
 namespace Renderer {
 
diff --git a/src/libprojectM/Renderer/RenderItem.hpp b/src/libprojectM/Renderer/RenderItem.hpp
index faa0671d3..3da337eda 100644
--- a/src/libprojectM/Renderer/RenderItem.hpp
+++ b/src/libprojectM/Renderer/RenderItem.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "RenderContext.hpp"
+#include <projectM-opengl.h>
 
 namespace libprojectM {
 namespace Renderer {
diff --git a/src/libprojectM/Renderer/Sampler.hpp b/src/libprojectM/Renderer/Sampler.hpp
index e118bd863..a78a3d1f2 100644
--- a/src/libprojectM/Renderer/Sampler.hpp
+++ b/src/libprojectM/Renderer/Sampler.hpp
@@ -4,7 +4,7 @@
 */
 #pragma once
 
-#include "projectM-opengl.h"
+#include <projectM-opengl.h>
 
 #include <memory>
 
diff --git a/src/libprojectM/Renderer/Shader.cpp b/src/libprojectM/Renderer/Shader.cpp
index 7cb171279..4a64ab9db 100644
--- a/src/libprojectM/Renderer/Shader.cpp
+++ b/src/libprojectM/Renderer/Shader.cpp
@@ -2,6 +2,8 @@
 
 #include <glm/gtc/type_ptr.hpp>
 
+#include <vector>
+
 namespace libprojectM {
 namespace Renderer {
 
diff --git a/src/libprojectM/Renderer/Shader.hpp b/src/libprojectM/Renderer/Shader.hpp
index fd600bf66..e3b0e6639 100644
--- a/src/libprojectM/Renderer/Shader.hpp
+++ b/src/libprojectM/Renderer/Shader.hpp
@@ -4,7 +4,7 @@
  */
 #pragma once
 
-#include "Texture.hpp"
+#include "Renderer/Texture.hpp"
 
 #include <glm/vec2.hpp>
 #include <glm/vec3.hpp>
diff --git a/src/libprojectM/Renderer/Texture.hpp b/src/libprojectM/Renderer/Texture.hpp
index b0855ba20..4577b1712 100644
--- a/src/libprojectM/Renderer/Texture.hpp
+++ b/src/libprojectM/Renderer/Texture.hpp
@@ -6,9 +6,7 @@
 
 #include "Renderer/Sampler.hpp"
 
-#include <memory>
 #include <string>
-#include <vector>
 
 namespace libprojectM {
 namespace Renderer {
diff --git a/src/libprojectM/Renderer/TextureAttachment.hpp b/src/libprojectM/Renderer/TextureAttachment.hpp
index 27f8bfcb6..c1de83133 100644
--- a/src/libprojectM/Renderer/TextureAttachment.hpp
+++ b/src/libprojectM/Renderer/TextureAttachment.hpp
@@ -4,9 +4,7 @@
  */
 #pragma once
 
-#include "Texture.hpp"
-
-#include "projectM-opengl.h"
+#include "Renderer/Texture.hpp"
 
 #include <memory>
 
diff --git a/src/libprojectM/Renderer/TextureManager.cpp b/src/libprojectM/Renderer/TextureManager.cpp
index 5866c8a3f..b8d28cae7 100644
--- a/src/libprojectM/Renderer/TextureManager.cpp
+++ b/src/libprojectM/Renderer/TextureManager.cpp
@@ -1,19 +1,21 @@
 #include "TextureManager.hpp"
 
+#include "FileScanner.hpp"
 #include "IdleTextures.hpp"
-
 #include "MilkdropNoise.hpp"
-
-#include "SOIL2/SOIL2.h"
-
 #include "Texture.hpp"
-#include "projectM-opengl.h"
+
+#include <SOIL2/SOIL2.h>
 
 #include <algorithm>
 #include <memory>
 #include <random>
 #include <vector>
 
+#ifdef DEBUG
+#include <iostream>
+#endif
+
 // Missing in macOS SDK. Query will most certainly fail, but then use the default format.
 #ifndef GL_TEXTURE_IMAGE_FORMAT
 #define GL_TEXTURE_IMAGE_FORMAT 0x828F
diff --git a/src/libprojectM/Renderer/TextureManager.hpp b/src/libprojectM/Renderer/TextureManager.hpp
index 0cafcfcc8..87883196e 100644
--- a/src/libprojectM/Renderer/TextureManager.hpp
+++ b/src/libprojectM/Renderer/TextureManager.hpp
@@ -1,11 +1,7 @@
 #pragma once
 
-#include "Renderer/FileScanner.hpp"
 #include "Renderer/TextureSamplerDescriptor.hpp"
 
-#include "projectM-opengl.h"
-
-#include <iostream>
 #include <map>
 #include <string>
 #include <vector>
diff --git a/src/libprojectM/Renderer/TextureSamplerDescriptor.hpp b/src/libprojectM/Renderer/TextureSamplerDescriptor.hpp
index 11901e688..40deba8ec 100644
--- a/src/libprojectM/Renderer/TextureSamplerDescriptor.hpp
+++ b/src/libprojectM/Renderer/TextureSamplerDescriptor.hpp
@@ -1,8 +1,6 @@
 #pragma once
 
-#include "Texture.hpp"
-#include "Sampler.hpp"
-#include "Shader.hpp"
+#include "Renderer/Shader.hpp"
 
 namespace libprojectM {
 namespace Renderer {
diff --git a/src/libprojectM/Renderer/TransitionShaderManager.hpp b/src/libprojectM/Renderer/TransitionShaderManager.hpp
index a32ffd50a..cc5c3b0ed 100644
--- a/src/libprojectM/Renderer/TransitionShaderManager.hpp
+++ b/src/libprojectM/Renderer/TransitionShaderManager.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Shader.hpp"
+#include "Renderer/Shader.hpp"
 
 #include <random>
 
diff --git a/src/libprojectM/projectM-opengl.h b/src/libprojectM/projectM-opengl.h
index 2e2c420d5..bbee00381 100644
--- a/src/libprojectM/projectM-opengl.h
+++ b/src/libprojectM/projectM-opengl.h
@@ -2,38 +2,33 @@
    Include appropriate OpenGL headers for this platform.
 **/
 
-#ifndef  __PROJECTM_OPENGL_H__
-#define  __PROJECTM_OPENGL_H__
-
-// stuff that needs to be ported to newer GL calls
-#define GL_TRANSITION
+#pragma once
 
 // Enable openGL extra checks, better not be enabled in release build
-#define OGL_DEBUG                   0
+#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
-
-// If a shader compilation failure occurs, it dumps shader source into /tmp instead of stderr
-#define DUMP_SHADERS_ON_ERROR       0
+#define UNLOCK_FPS 0
 
 #ifdef __APPLE__
+// Silence the "OpenGL API deprecated" warning which is shown for every OpenGL function call since macOS 10.14 SDK
+# define GL_SILENCE_DEPRECATION
 # 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>
+# 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
+# define GLM_FORCE_CXX03
 # include <windows.h>
-#include "GL/glew.h"
-#include "GL/wglew.h"
+# include <GL/glew.h>
+# include <GL/wglew.h>
 #else /* linux/unix/other */
 # ifdef USE_GLES
 #  include <GLES3/gl3.h>
@@ -45,6 +40,3 @@
 #  include <GL/glext.h>
 # endif
 #endif
-
-
-#endif // __PROJECTM_OPENGL_H__