diff --git a/src/projectM-engine/CMakeLists.txt b/src/projectM-engine/CMakeLists.txt
index 794578540..4eeab3a8e 100644
--- a/src/projectM-engine/CMakeLists.txt
+++ b/src/projectM-engine/CMakeLists.txt
@@ -1,5 +1,5 @@
 PROJECT(projectM)
-ADD_LIBRARY(projectM SHARED projectM.cpp projectM.h pbuffer.cpp pbuffer.h InitCond.cpp InitCond.h 
+ADD_LIBRARY(projectM SHARED projectM.cpp projectM.h pbuffer.cpp pbuffer.h InitCond.cpp InitCond.hpp
  Expr.cpp PCM.cpp Parser.cpp Preset.cpp common.h BeatDetect.cpp PCM.h PerPixelEqn.cpp Eval.h 
 Param.cpp CustomWave.cpp CustomShape.h CustomShape.cpp Param.h CustomWave.h BeatDetect.h menu.cpp console_interface.h 
 Func.h Func.cpp Eval.cpp wipemalloc.h browser.cpp PerFrameEqn.cpp PerPointEqn.cpp editor.cpp fftsg.cpp glConsole.cpp  console_interface.cpp
diff --git a/src/projectM-engine/CustomShape.cpp b/src/projectM-engine/CustomShape.cpp
index 62a4edc68..20fc1c9f9 100755
--- a/src/projectM-engine/CustomShape.cpp
+++ b/src/projectM-engine/CustomShape.cpp
@@ -29,7 +29,7 @@
 #include "CustomShape.h"
 #include "Eval.h"
 #include "Expr.h"
-#include "InitCond.h"
+#include "InitCond.hpp"
 #include "Param.h"
 #include "PerFrameEqn.h"
 #include "Preset.hpp"
diff --git a/src/projectM-engine/CustomShape.h b/src/projectM-engine/CustomShape.h
index 86d96d877..ab4b3d376 100755
--- a/src/projectM-engine/CustomShape.h
+++ b/src/projectM-engine/CustomShape.h
@@ -33,7 +33,7 @@
 #include "SplayTree.hpp"
 #include "Param.h"
 #include "PerFrameEqn.h"
-#include "InitCond.h"
+#include "InitCond.hpp"
 
 class Preset;
 
diff --git a/src/projectM-engine/CustomWave.cpp b/src/projectM-engine/CustomWave.cpp
index 59d1bfc3b..6f63a7e6d 100755
--- a/src/projectM-engine/CustomWave.cpp
+++ b/src/projectM-engine/CustomWave.cpp
@@ -31,7 +31,7 @@
 #include "CustomWave.h"
 #include "Eval.h"
 #include "Expr.h"
-#include "InitCond.h"
+#include "InitCond.hpp"
 #include "Param.h"
 #include "PerFrameEqn.h"
 #include "PerPointEqn.h"
diff --git a/src/projectM-engine/InitCond.cpp b/src/projectM-engine/InitCond.cpp
index 57133f3d1..e630041e0 100755
--- a/src/projectM-engine/InitCond.cpp
+++ b/src/projectM-engine/InitCond.cpp
@@ -28,7 +28,7 @@
 #include "fatal.h"
 
 #include "Expr.h"
-#include "InitCond.h"
+#include "InitCond.hpp"
 #include "Param.h"
 #include "SplayTree.hpp"
 
diff --git a/src/projectM-engine/InitCond.h b/src/projectM-engine/InitCond.hpp
similarity index 97%
rename from src/projectM-engine/InitCond.h
rename to src/projectM-engine/InitCond.hpp
index e76b2aa7e..edafece51 100755
--- a/src/projectM-engine/InitCond.h
+++ b/src/projectM-engine/InitCond.hpp
@@ -26,8 +26,8 @@
  * $Log$
  */
 
-#ifndef _INIT_COND_H
-#define _INIT_COND_H
+#ifndef _INIT_COND_HPP
+#define _INIT_COND_HPP
 
 //#define INIT_COND_DEBUG 2
 #define INIT_COND_DEBUG 0
diff --git a/src/projectM-engine/InitCondUtils.hpp b/src/projectM-engine/InitCondUtils.hpp
index e18a08b15..8c832922b 100644
--- a/src/projectM-engine/InitCondUtils.hpp
+++ b/src/projectM-engine/InitCondUtils.hpp
@@ -1,7 +1,7 @@
 #ifndef _INIT_COND_UTILS_HPP
 #define _INIT_COND_UTILS_HPP
 #include "SplayTree.hpp"
-#include "InitCond.h"
+#include "InitCond.hpp"
 
 namespace InitCondUtils {
 class LoadUnspecInitCond {
diff --git a/src/projectM-engine/Param.cpp b/src/projectM-engine/Param.cpp
index 973b4660b..4e0f2aea2 100755
--- a/src/projectM-engine/Param.cpp
+++ b/src/projectM-engine/Param.cpp
@@ -33,7 +33,7 @@
 #include "CustomShape.h"
 #include "Eval.h"
 #include "Expr.h"
-#include "InitCond.h"
+#include "InitCond.hpp"
 #include "Param.h"
 #include "Preset.hpp"
 #include "SplayTree.hpp"
diff --git a/src/projectM-engine/Parser.cpp b/src/projectM-engine/Parser.cpp
index 88c6137da..6b316a0e5 100755
--- a/src/projectM-engine/Parser.cpp
+++ b/src/projectM-engine/Parser.cpp
@@ -33,7 +33,7 @@
 #include "Expr.h"
 #include "Eval.h"
 #include "Func.h"
-#include "InitCond.h"
+#include "InitCond.hpp"
 #include "Param.h"
 #include "Preset.hpp"
 #include "Parser.h"
diff --git a/src/projectM-engine/Parser.h b/src/projectM-engine/Parser.h
index 58e6bf160..93d0c38d4 100755
--- a/src/projectM-engine/Parser.h
+++ b/src/projectM-engine/Parser.h
@@ -36,7 +36,7 @@
 
 #include "Expr.h"
 #include "PerFrameEqn.h"
-#include "InitCond.h"
+#include "InitCond.hpp"
 #include "Preset.hpp"
 
 /* Strings that prefix (and denote the type of) equations */
diff --git a/src/projectM-engine/Preset.hpp b/src/projectM-engine/Preset.hpp
index cfa87db90..cbe42e444 100644
--- a/src/projectM-engine/Preset.hpp
+++ b/src/projectM-engine/Preset.hpp
@@ -41,7 +41,7 @@
 #include "BuiltinParams.hpp"
 #include "PresetFrameIO.hpp"
 #include "SplayTree.hpp"
-#include "InitCond.h"
+#include "InitCond.hpp"
 #include <vector>
 
 
diff --git a/src/projectM-engine/Renderer.cpp b/src/projectM-engine/Renderer.cpp
index 6ac3cb294..91a2e73e6 100644
--- a/src/projectM-engine/Renderer.cpp
+++ b/src/projectM-engine/Renderer.cpp
@@ -565,7 +565,7 @@ void Renderer::reset(int w, int h)
         other_font = new FTGLPixmapFont(path);
    
       }
-#endif /** USE_FTGL */      
+#endif /** USE_FTGL */
 }
 
 
diff --git a/src/projectM-engine/menu.cpp b/src/projectM-engine/menu.cpp
index b1d251b4a..c4bdb9659 100755
--- a/src/projectM-engine/menu.cpp
+++ b/src/projectM-engine/menu.cpp
@@ -35,7 +35,7 @@
 #include "Param.h"
 #include "SplayTree.hpp"
 
-#include "InitCond.h"
+#include "InitCond.hpp"
 
 #include "glConsole.h"