diff --git a/src/libprojectM/MilkdropPresetFactory/CustomShape.hpp b/src/libprojectM/MilkdropPresetFactory/CustomShape.hpp
index bf5815dc4..eb9a8e8c7 100755
--- a/src/libprojectM/MilkdropPresetFactory/CustomShape.hpp
+++ b/src/libprojectM/MilkdropPresetFactory/CustomShape.hpp
@@ -34,7 +34,7 @@
 #include "Param.hpp"
 #include "PerFrameEqn.hpp"
 #include "InitCond.hpp"
-#include "Renderable.hpp"
+#include "Renderer/Renderable.hpp"
 #include <vector>
 
 class Preset;
diff --git a/src/libprojectM/MilkdropPresetFactory/CustomWave.hpp b/src/libprojectM/MilkdropPresetFactory/CustomWave.hpp
index d5613586c..a951fedeb 100755
--- a/src/libprojectM/MilkdropPresetFactory/CustomWave.hpp
+++ b/src/libprojectM/MilkdropPresetFactory/CustomWave.hpp
@@ -41,7 +41,7 @@ class Preset;
 #include "Common.hpp"
 #include "Param.hpp"
 #include "PerFrameEqn.hpp"
-#include "Waveform.hpp"
+#include "Renderer/Waveform.hpp"
 
 #include <map>
 
diff --git a/src/libprojectM/MilkdropPresetFactory/PresetFrameIO.cpp b/src/libprojectM/MilkdropPresetFactory/PresetFrameIO.cpp
index 4e7a4f3ee..df294fc9d 100644
--- a/src/libprojectM/MilkdropPresetFactory/PresetFrameIO.cpp
+++ b/src/libprojectM/MilkdropPresetFactory/PresetFrameIO.cpp
@@ -3,7 +3,7 @@
 #include <math.h>
 #include <cassert>
 #include <iostream>
-#include "BeatDetect.hpp"
+#include "Renderer/BeatDetect.hpp"
 
 PresetInputs::PresetInputs() : PipelineContext()
 {
diff --git a/src/libprojectM/MilkdropPresetFactory/PresetFrameIO.hpp b/src/libprojectM/MilkdropPresetFactory/PresetFrameIO.hpp
index 15c8826b4..229879c2f 100644
--- a/src/libprojectM/MilkdropPresetFactory/PresetFrameIO.hpp
+++ b/src/libprojectM/MilkdropPresetFactory/PresetFrameIO.hpp
@@ -1,12 +1,12 @@
 #ifndef PRESET_FRAME_IO_HPP
 #define PRESET_FRAME_IO_HPP
 #include <vector>
-#include "MilkdropWaveform.hpp"
-#include "Pipeline.hpp"
-#include "Filters.hpp"
+#include "Renderer/MilkdropWaveform.hpp"
+#include "Renderer/Pipeline.hpp"
+#include "Renderer/Filters.hpp"
 #include "CustomShape.hpp"
 #include "CustomWave.hpp"
-#include "VideoEcho.hpp"
+#include "Renderer/VideoEcho.hpp"
 
 
 /// Container for all *read only* engine variables a preset requires to
diff --git a/src/libprojectM/NativePresetFactory/CMakeLists.txt b/src/libprojectM/NativePresetFactory/CMakeLists.txt
index cd9a9703f..74f8d5184 100644
--- a/src/libprojectM/NativePresetFactory/CMakeLists.txt
+++ b/src/libprojectM/NativePresetFactory/CMakeLists.txt
@@ -1,10 +1,15 @@
 PROJECT(NativePresetFactory)
 cmake_minimum_required(VERSION 2.4.0)
 
+    if(COMMAND cmake_policy)
+      cmake_policy(SET CMP0003 NEW)
+    endif(COMMAND cmake_policy)
+
 SET(NativePresetFactory_SOURCES NativePresetFactory.cpp)
+
 SET (CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -fPIC)
  
 INCLUDE_DIRECTORIES(${projectM_SOURCE_DIR} ${Renderer_SOURCE_DIR})
 ADD_LIBRARY(NativePresetFactory STATIC ${NativePresetFactory_SOURCES})
 SET_TARGET_PROPERTIES(NativePresetFactory PROPERTIES VERSION 2.00 SOVERSION 2)
-TARGET_LINK_LIBRARIES(NativePresetFactory m)
+TARGET_LINK_LIBRARIES(NativePresetFactory Renderer m)
diff --git a/src/libprojectM/Preset.hpp b/src/libprojectM/Preset.hpp
index b684be870..4171e9757 100644
--- a/src/libprojectM/Preset.hpp
+++ b/src/libprojectM/Preset.hpp
@@ -10,9 +10,9 @@
 
 #include <string>
 
-#include "BeatDetect.hpp"
-#include "Pipeline.hpp"
-#include "PipelineContext.hpp"
+#include "Renderer/BeatDetect.hpp"
+#include "Renderer/Pipeline.hpp"
+#include "Renderer/PipelineContext.hpp"
 
 class Preset {
 public:
diff --git a/src/libprojectM/Renderer/Renderer.hpp b/src/libprojectM/Renderer/Renderer.hpp
index 9dab87cb4..49e58bfe4 100644
--- a/src/libprojectM/Renderer/Renderer.hpp
+++ b/src/libprojectM/Renderer/Renderer.hpp
@@ -24,7 +24,7 @@
 #include <FTGLPixmapFont.h>
 #include <FTGLExtrdFont.h>
 #else
-#include <FTGL/ftgl.h>
+#include <FTGL/FTFont.h>
 #include <FTGL/FTGLPixmapFont.h>
 #include <FTGL/FTGLExtrdFont.h>
 #endif