diff --git a/src/libprojectM/CMakeLists.txt b/src/libprojectM/CMakeLists.txt
index 8acfb82cf..85cd1609a 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 68851e548..6889d8ad2 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 4f9a0f3ac..1acbeb239 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 326790b2a..5090b37eb 100644
--- a/src/libprojectM/MilkdropPreset/CustomShape.hpp
+++ b/src/libprojectM/MilkdropPreset/CustomShape.hpp
@@ -31,7 +31,7 @@ public:
      * @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 7e16d6afc..7c4c3df1a 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 @@ public:
      * @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 81a930968..ef1716115 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 c1f0ab17d..db8eb43ba 100644
--- a/src/libprojectM/MilkdropPreset/MilkdropPreset.hpp
+++ b/src/libprojectM/MilkdropPreset/MilkdropPreset.hpp
@@ -93,7 +93,7 @@ private:
 
     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 a48edea77..8be613d86 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 8f2a3afc7..d8925d3ac 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 @@ private:
     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 0913ac377..72c0f61ca 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 68fef489d..57b5faecf 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 @@ public:
      * @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 cdd4e0894..ba0ea14b1 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 0d4a0304f..7a8af5cb9 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 1c6fc27f6..25cd69201 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.