diff --git a/src/libprojectM/MilkdropPresetFactory/MilkdropPresetFactory.cpp b/src/libprojectM/MilkdropPresetFactory/MilkdropPresetFactory.cpp
index ff5e60475..8fe8260e5 100644
--- a/src/libprojectM/MilkdropPresetFactory/MilkdropPresetFactory.cpp
+++ b/src/libprojectM/MilkdropPresetFactory/MilkdropPresetFactory.cpp
@@ -10,17 +10,6 @@
 //
 //
 //
-// C++ Interface: PresetFactory
-//
-// Description: 
-//
-//
-// Author: Carmelo Piccione <carmelo.piccione@gmail.com>, (C) 2008
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
-
 #include "MilkdropPresetFactory.hpp"
 #include "MilkdropPreset.hpp"
 #include "BuiltinFuncs.hpp"
diff --git a/src/libprojectM/MilkdropPresetFactory/MilkdropPresetFactory.hpp b/src/libprojectM/MilkdropPresetFactory/MilkdropPresetFactory.hpp
index a5e0ecf99..cbf549dea 100644
--- a/src/libprojectM/MilkdropPresetFactory/MilkdropPresetFactory.hpp
+++ b/src/libprojectM/MilkdropPresetFactory/MilkdropPresetFactory.hpp
@@ -14,8 +14,9 @@
 #define __MILKDROP_PRESET_FACTORY_HPP
 
 #include <memory>
-#include "PresetFactory.hpp"
-#include "PresetFrameIO.hpp"
+#include "../PresetFactory.hpp"
+class PresetOutputs;
+class PresetInputs;
 
 class MilkdropPresetFactory : public PresetFactory {
 
@@ -33,7 +34,7 @@ public:
 private:
 	void initializePresetOutputs(int gx, int gy);
 	void reset();
-	PresetOutputs _presetOutputs;
+	PresetOutputs * _presetOutputs;
 	//PresetInputs _presetInputs;
 };
 
diff --git a/src/libprojectM/NativePresetFactory/NativePresetFactory.hpp b/src/libprojectM/NativePresetFactory/NativePresetFactory.hpp
index 3e8febd4c..3e57a9c66 100644
--- a/src/libprojectM/NativePresetFactory/NativePresetFactory.hpp
+++ b/src/libprojectM/NativePresetFactory/NativePresetFactory.hpp
@@ -14,7 +14,7 @@
 #define __NATIVE_PRESET_FACTORY_HPP
 
 #include <memory>
-#include "PresetFactory.hpp"
+#include "../PresetFactory.hpp"
 
 class PresetLibrary;
 
diff --git a/src/libprojectM/PresetFactoryManager.cpp b/src/libprojectM/PresetFactoryManager.cpp
index 50c8e0217..10065a053 100644
--- a/src/libprojectM/PresetFactoryManager.cpp
+++ b/src/libprojectM/PresetFactoryManager.cpp
@@ -12,11 +12,11 @@
 #include "PresetFactoryManager.hpp"
 
 #ifndef DISABLE_MILKDROP_PRESETS
-#include "MilkdropPresetFactory.hpp"
+#include "MilkdropPresetFactory/MilkdropPresetFactory.hpp"
 #endif
 
-#ifndef DISABLE_COMPILED_PRESETS
-#include "NativePresetFactory.hpp"
+#ifndef DISABLE_NATIVE_PRESETS
+#include "NativePresetFactory/NativePresetFactory.hpp"
 #endif
 
 #include <sstream>
@@ -37,8 +37,8 @@ void PresetFactoryManager::initialize(int gx, int gy) {
 	factory = new MilkdropPresetFactory(_gx, _gy);
 	registerFactory(factory->supportedExtensions(), factory);		
 	#endif
-
-	#ifndef DISABLE_COMPILED_PRESETS
+	
+	#ifndef DISABLE_NATIVE_PRESETS
 	factory = new NativePresetFactory();
 	registerFactory(factory->supportedExtensions(), factory);
 	#endif