diff --git a/src/projectM-engine/BeatDetect.cpp b/src/projectM-engine/BeatDetect.cpp
index ea7a717f9..df89a8f68 100755
--- a/src/projectM-engine/BeatDetect.cpp
+++ b/src/projectM-engine/BeatDetect.cpp
@@ -32,10 +32,9 @@
 #include "wipemalloc.h"
 
 #include "Common.hpp"
-#include "projectM.hpp"
-#include "BeatDetect.hpp"
 #include "PCM.hpp"
 #include <cmath>
+#include "BeatDetect.hpp"
 
 DLLEXPORT BeatDetect::BeatDetect(PCM *pcm) {
   int x,y; 
diff --git a/src/projectM-engine/BeatDetect.hpp b/src/projectM-engine/BeatDetect.hpp
index 31d7a1b5c..f9f118655 100755
--- a/src/projectM-engine/BeatDetect.hpp
+++ b/src/projectM-engine/BeatDetect.hpp
@@ -31,7 +31,6 @@
 #ifndef _BEAT_DETECT_H
 #define _BEAT_DETECT_H
 
-#include "projectM.hpp"
 #include "PCM.hpp"
 
 class BeatDetect
diff --git a/src/projectM-engine/BuiltinFuncs.cpp b/src/projectM-engine/BuiltinFuncs.cpp
index f3ace3dd5..b3a9ba10b 100644
--- a/src/projectM-engine/BuiltinFuncs.cpp
+++ b/src/projectM-engine/BuiltinFuncs.cpp
@@ -18,13 +18,13 @@
 #include <string>
 #include "Algorithms.hpp"
 #include <iostream>
-
+#include "fatal.h"
 using namespace Algorithms;
 
 std::map<std::string, Func*> BuiltinFuncs::builtin_func_tree;
 
 int BuiltinFuncs::load_builtin_func(const std::string & name, float (*func_ptr)(float*), int num_args) {
-
+	
   Func * func; 
   int retval; 
 
diff --git a/src/projectM-engine/BuiltinFuncs.hpp b/src/projectM-engine/BuiltinFuncs.hpp
index bd5249672..bdbe6435a 100644
--- a/src/projectM-engine/BuiltinFuncs.hpp
+++ b/src/projectM-engine/BuiltinFuncs.hpp
@@ -18,7 +18,6 @@
 #include <cmath>
 #include <cstdlib>
 #include <cassert>
-#include "projectM.hpp"
 
 #include "RandomNumberGenerators.hpp"
 
diff --git a/src/projectM-engine/BuiltinParams.cpp b/src/projectM-engine/BuiltinParams.cpp
index 803cc1a6e..ba4dec13c 100644
--- a/src/projectM-engine/BuiltinParams.cpp
+++ b/src/projectM-engine/BuiltinParams.cpp
@@ -4,9 +4,9 @@
 #include "projectM.hpp"
 #include <cassert>
 #include "Algorithms.hpp"
-#include "InitCondUtils.hpp"
 #include <iostream>
 #include <algorithm>
+#include "InitCondUtils.hpp"
 
 
 using namespace Algorithms;
diff --git a/src/projectM-engine/CustomWave.cpp b/src/projectM-engine/CustomWave.cpp
index 706b6a4b7..82aa6d7ab 100755
--- a/src/projectM-engine/CustomWave.cpp
+++ b/src/projectM-engine/CustomWave.cpp
@@ -23,7 +23,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "projectM.hpp"
 
 #include "Common.hpp"
 #include "fatal.h"
diff --git a/src/projectM-engine/Eval.cpp b/src/projectM-engine/Eval.cpp
index a2cdf359a..1810f7441 100755
--- a/src/projectM-engine/Eval.cpp
+++ b/src/projectM-engine/Eval.cpp
@@ -20,10 +20,9 @@
  */
 /* Evaluation Code */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
-#include "projectM.hpp"
 #include "Common.hpp"
 #include "fatal.h"
 
@@ -31,9 +30,10 @@
 #include "Expr.hpp"
 #include "Param.hpp"
 #include "Func.hpp"
-#include "BuiltinFuncs.hpp"
 #include "wipemalloc.h"
 
+#include "BuiltinFuncs.hpp"
+
 InfixOp *Eval::infix_add = NULL;
 InfixOp *Eval::infix_minus = NULL;
 InfixOp *Eval::infix_div = NULL;
diff --git a/src/projectM-engine/Eval.hpp b/src/projectM-engine/Eval.hpp
index bdf0113f1..6bbe2493f 100755
--- a/src/projectM-engine/Eval.hpp
+++ b/src/projectM-engine/Eval.hpp
@@ -28,10 +28,11 @@
 
 /* Eval.hpp: evaluation functions of expressions */
 
-#ifndef _EVAL_H
-#define _EVAL_H
+#ifndef __EVAL_H
+#define __EVAL_H
 
-#include "projectM.hpp"
+#include "fatal.h"
+//#include "projectM.hpp"
 #include "Func.hpp"
 #include "Param.hpp"
 
diff --git a/src/projectM-engine/Expr.cpp b/src/projectM-engine/Expr.cpp
index 2a3a9e979..e830b0af2 100755
--- a/src/projectM-engine/Expr.cpp
+++ b/src/projectM-engine/Expr.cpp
@@ -22,9 +22,10 @@
 #include "wipemalloc.h"
 
 #include "Expr.hpp"
-#include "Eval.hpp"
 #include <cassert>
+
 #include <iostream>
+#include "Eval.hpp"
 
 float GenExpr::eval_gen_expr ( int mesh_i, int mesh_j )
 {
diff --git a/src/projectM-engine/KeyHandler.cpp b/src/projectM-engine/KeyHandler.cpp
index 4937e039a..e708674f9 100755
--- a/src/projectM-engine/KeyHandler.cpp
+++ b/src/projectM-engine/KeyHandler.cpp
@@ -21,7 +21,6 @@
 
 #include <stdio.h>
 
-#include "projectM.hpp"
 #include "Common.hpp"
 #include "fatal.h"
 #include "KeyHandler.hpp"
@@ -29,11 +28,13 @@
 #include "BeatDetect.hpp"
 #include "PresetChooser.hpp"
 #include "Renderer.hpp"
+#include "projectM.hpp"
+
 #include <iostream>
 #include "TimeKeeper.hpp"
 
-class Preset;
 
+class Preset;
 interface_t current_interface = DEFAULT_INTERFACE;
 
 void refreshConsole() {
diff --git a/src/projectM-engine/KeyHandler.hpp b/src/projectM-engine/KeyHandler.hpp
index c8edd21c5..b9a756326 100755
--- a/src/projectM-engine/KeyHandler.hpp
+++ b/src/projectM-engine/KeyHandler.hpp
@@ -28,7 +28,7 @@
 #define _KEY_HANDLER_HPP
 
 #include "event.h"
-
+class projectM;
 void default_key_handler(projectM *PM, projectMEvent event, projectMKeycode keycode);
 void refreshConsole();
 #if defined(__CPLUSPLUS) && !defined(MACOS)
diff --git a/src/projectM-engine/Param.cpp b/src/projectM-engine/Param.cpp
index be65c2492..de3d11714 100755
--- a/src/projectM-engine/Param.cpp
+++ b/src/projectM-engine/Param.cpp
@@ -25,7 +25,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
-#include "projectM.hpp"
 
 #include "fatal.h"
 #include "Common.hpp"
diff --git a/src/projectM-engine/Parser.cpp b/src/projectM-engine/Parser.cpp
index 896b15728..b73d897bc 100755
--- a/src/projectM-engine/Parser.cpp
+++ b/src/projectM-engine/Parser.cpp
@@ -29,7 +29,6 @@
 #include "Common.hpp"
 #include "fatal.h"
 
-#include "BuiltinFuncs.hpp"
 #include "CustomWave.hpp"
 #include "CustomShape.hpp"
 #include "Expr.hpp"
@@ -47,6 +46,7 @@
 #include "wipemalloc.h"
 #include <iostream>
 #include <sstream>
+#include "BuiltinFuncs.hpp"
 
 /* Grabs the next token from the file. The second argument points
    to the raw string */
diff --git a/src/projectM-engine/PerPixelEqn.cpp b/src/projectM-engine/PerPixelEqn.cpp
index f6ac690be..68cb9135d 100755
--- a/src/projectM-engine/PerPixelEqn.cpp
+++ b/src/projectM-engine/PerPixelEqn.cpp
@@ -23,7 +23,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <iostream>
-#include "projectM.hpp"
 
 #include "fatal.h"
 #include "Common.hpp"
diff --git a/src/projectM-engine/PerPointEqn.cpp b/src/projectM-engine/PerPointEqn.cpp
index e0c7d6e8d..e921916db 100755
--- a/src/projectM-engine/PerPointEqn.cpp
+++ b/src/projectM-engine/PerPointEqn.cpp
@@ -23,7 +23,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "projectM.hpp"
 #include <cassert>
 #include "fatal.h"
 #include "Common.hpp"
diff --git a/src/projectM-engine/Preset.hpp b/src/projectM-engine/Preset.hpp
index 1063b0eba..39a8b881b 100644
--- a/src/projectM-engine/Preset.hpp
+++ b/src/projectM-engine/Preset.hpp
@@ -61,16 +61,16 @@ public:
   ///  Load a preset by filename with input and output buffers specified.
   /// \param absoluteFilePath the absolute file path of a preset to load from the file system
   /// \param presetName a descriptive name for the preset. Usually just the file name
-  /// \param presetInputs a const reference to read only projectM engine variables
+  /// \param presetInputs a reference to read only projectM engine variables
   /// \param presetOutputs initialized and filled with data parsed from a preset
-  Preset(const std::string & absoluteFilePath, const std::string & presetName,  PresetInputs & presetInputs, PresetOutputs & presetOutputs);
+  Preset(const std::string & absoluteFilePath, const std::string & presetName, PresetInputs & presetInputs, PresetOutputs & presetOutputs);
 
   ///  Load a preset from an input stream with input and output buffers specified.
   /// \param in an already initialized input stream to read the preset file from
   /// \param presetName a descriptive name for the preset. Usually just the file name
-  /// \param presetInputs a const reference to read only projectM engine variables
+  /// \param presetInputs a reference to read only projectM engine variables
   /// \param presetOutputs initialized and filled with data parsed from a preset
-  Preset(std::istream & in, const std::string & presetName,  PresetInputs & presetInputs, PresetOutputs & presetOutputs);
+  Preset(std::istream & in, const std::string & presetName, PresetInputs & presetInputs, PresetOutputs & presetOutputs);
 
   ~Preset();
 
diff --git a/src/projectM-engine/PresetLoader.cpp b/src/projectM-engine/PresetLoader.cpp
index 8b6ba3b24..8848e04b2 100644
--- a/src/projectM-engine/PresetLoader.cpp
+++ b/src/projectM-engine/PresetLoader.cpp
@@ -30,7 +30,7 @@ extern "C"
 #endif
 
 #include <cassert>
-#include "projectM.hpp"
+#include "fatal.h"
 
 const std::string PresetLoader::PROJECTM_FILE_EXTENSION(".prjm");
 const std::string PresetLoader::MILKDROP_FILE_EXTENSION(".milk");
diff --git a/src/projectM-engine/projectM.cpp b/src/projectM-engine/projectM.cpp
index d59b456de..3dbdca01b 100755
--- a/src/projectM-engine/projectM.cpp
+++ b/src/projectM-engine/projectM.cpp
@@ -19,7 +19,7 @@
  *
  */
 #include "wipemalloc.h"
-#include "BuiltinFuncs.hpp"
+
 #include "fatal.h"
 #include "Common.hpp"
 #include "compare.h"
@@ -40,6 +40,7 @@
 //#include <xmms/plugin.h>
 #include <iostream>
 #include "projectM.hpp"
+#include "BuiltinFuncs.hpp"
 #include "BeatDetect.hpp"
 #include "Eval.hpp"
 #include "Param.hpp"