Consistently rename all C++ files .cpp/.hpp.

Fix (some) inclusion guard names to not clash with other libs.


git-svn-id: http://svn.drobilla.net/lad/ingen@613 a436a847-0d15-0410-975c-d299462d15a1

273 files changed, 1517 insertions, 1536 deletions

diff --git a/src/libs/client/ConnectionModel.cpp b/src/libs/client/ConnectionModel.cpp
index 4860a7db..a40da9e4 100644
--- a/src/libs/client/ConnectionModel.cpp
+++ b/src/libs/client/ConnectionModel.cpp
@@ -16,9 +16,9 @@
  */
 
 #include <cassert>
-#include "ConnectionModel.h"
-#include "PortModel.h"
-#include "PatchModel.h"
+#include "ConnectionModel.hpp"
+#include "PortModel.hpp"
+#include "PatchModel.hpp"
 
 namespace Ingen {
 namespace Client {
diff --git a/src/libs/client/ConnectionModel.h b/src/libs/client/ConnectionModel.hpp
index 9e62d5b4..59dacae7 100644
--- a/src/libs/client/ConnectionModel.h
+++ b/src/libs/client/ConnectionModel.hpp
@@ -19,9 +19,9 @@
 #define CONNECTIONMODEL_H
 
 #include <string>
-#include <raul/Path.h>
-#include <raul/SharedPtr.h>
-#include "PortModel.h"
+#include <raul/Path.hpp>
+#include <raul/SharedPtr.hpp>
+#include "PortModel.hpp"
 #include <cassert>
 using std::string;
 
diff --git a/src/libs/client/ControlModel.h b/src/libs/client/ControlModel.hpp
index 5729faec..db0e156b 100644
--- a/src/libs/client/ControlModel.h
+++ b/src/libs/client/ControlModel.hpp
@@ -19,7 +19,7 @@
 #define CONTROLMODEL_H
 
 #include <string>
-#include <raul/Path.h>
+#include <raul/Path.hpp>
 
 namespace Ingen {
 namespace Client {
diff --git a/src/libs/client/DeprecatedLoader.cpp b/src/libs/client/DeprecatedLoader.cpp
index 3c95d9ac..c5354c5a 100644
--- a/src/libs/client/DeprecatedLoader.cpp
+++ b/src/libs/client/DeprecatedLoader.cpp
@@ -29,15 +29,15 @@
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <libxml/xpath.h>
-#include <raul/Path.h>
-#include "interface/EngineInterface.h"
-#include "PatchModel.h"
-#include "NodeModel.h"
-#include "ConnectionModel.h"
-#include "PortModel.h"
-#include "PresetModel.h"
-#include "PluginModel.h"
-#include "DeprecatedLoader.h"
+#include <raul/Path.hpp>
+#include "interface/EngineInterface.hpp"
+#include "PatchModel.hpp"
+#include "NodeModel.hpp"
+#include "ConnectionModel.hpp"
+#include "PortModel.hpp"
+#include "PresetModel.hpp"
+#include "PluginModel.hpp"
+#include "DeprecatedLoader.hpp"
 
 using std::string; using std::vector; using std::pair;
 using std::cerr; using std::cout; using std::endl;
diff --git a/src/libs/client/DeprecatedLoader.h b/src/libs/client/DeprecatedLoader.hpp
index 1bf81c9d..593cfb33 100644
--- a/src/libs/client/DeprecatedLoader.h
+++ b/src/libs/client/DeprecatedLoader.hpp
@@ -25,10 +25,10 @@
 #include <boost/optional.hpp>
 #include <glibmm/ustring.h>
 #include <libxml/tree.h>
-#include <raul/SharedPtr.h>
-#include <raul/Path.h>
-#include "interface/EngineInterface.h"
-#include "ObjectModel.h"
+#include <raul/SharedPtr.hpp>
+#include <raul/Path.hpp>
+#include "interface/EngineInterface.hpp"
+#include "ObjectModel.hpp"
 
 using std::string;
 using Ingen::Shared::EngineInterface;
diff --git a/src/libs/client/DirectSigClientInterface.h b/src/libs/client/DirectSigClientInterface.hpp
index 18b1247b..43877992 100644
--- a/src/libs/client/DirectSigClientInterface.h
+++ b/src/libs/client/DirectSigClientInterface.hpp
@@ -21,7 +21,7 @@
 #include <inttypes.h>
 #include <string>
 #include <sigc++/sigc++.h>
-#include "SigClientInterface.h"
+#include "SigClientInterface.hpp"
 using std::string;
 
 namespace Ingen {
diff --git a/src/libs/client/Makefile.am b/src/libs/client/Makefile.am
index 1c009868..45ec0bea 100644
--- a/src/libs/client/Makefile.am
+++ b/src/libs/client/Makefile.am
@@ -20,38 +20,38 @@ libingen_client_la_LIBADD = \
 	@LSIGCPP_LIBS@ @GLIBMM_LIBS@
 
 libingen_client_la_SOURCES = \
-	client.h \
-	client.cpp \
-	OSCEngineSender.h \
-	OSCEngineSender.cpp \
-	OSCClientReceiver.h \
+	$(top_srcdir)/ingen/src/common/interface/ClientInterface.hpp \
+	$(top_srcdir)/ingen/src/common/interface/EngineInterface.hpp \
+	ConnectionModel.cpp \
+	ConnectionModel.hpp \
+	ControlModel.hpp \
+	DeprecatedLoader.cpp \
+	DeprecatedLoader.hpp \
+	DirectSigClientInterface.hpp \
+	NodeModel.cpp \
+	NodeModel.hpp \
 	OSCClientReceiver.cpp \
-	SigClientInterface.h \
-	DirectSigClientInterface.h \
-	ThreadedSigClientInterface.h \
-	ThreadedSigClientInterface.cpp \
-	PresetModel.h \
-	ControlModel.h \
-	ObjectModel.h \
+	OSCClientReceiver.hpp \
+	OSCEngineSender.cpp \
+	OSCEngineSender.hpp \
 	ObjectModel.cpp \
-	NodeModel.h \
-	NodeModel.cpp \
-	PortModel.h \
-	PortModel.cpp \
-	PatchModel.h \
+	ObjectModel.hpp \
 	PatchModel.cpp \
-	PluginModel.h \
+	PatchModel.hpp \
 	PluginModel.cpp \
-	Serializer.h \
+	PluginModel.hpp \
+	PortModel.cpp \
+	PortModel.hpp \
+	PresetModel.hpp \
 	Serializer.cpp \
-	DeprecatedLoader.h \
-	DeprecatedLoader.cpp \
-	ConnectionModel.h \
-	ConnectionModel.cpp \
-	Store.h \
+	Serializer.hpp \
+	SigClientInterface.hpp \
 	Store.cpp \
-	$(top_srcdir)/ingen/src/common/interface/ClientInterface.h \
-	$(top_srcdir)/ingen/src/common/interface/EngineInterface.h
+	Store.hpp \
+	ThreadedSigClientInterface.cpp \
+	ThreadedSigClientInterface.hpp \
+	client.cpp \
+	client.hpp
 
 endif # BUILD_CLIENT_LIB
 
diff --git a/src/libs/client/NodeModel.cpp b/src/libs/client/NodeModel.cpp
index c3414c79..39c31c82 100644
--- a/src/libs/client/NodeModel.cpp
+++ b/src/libs/client/NodeModel.cpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "NodeModel.h"
-#include "PatchModel.h"
+#include "NodeModel.hpp"
+#include "PatchModel.hpp"
 #include <cassert>
 
 namespace Ingen {
diff --git a/src/libs/client/NodeModel.h b/src/libs/client/NodeModel.hpp
index f8866f15..68027526 100644
--- a/src/libs/client/NodeModel.h
+++ b/src/libs/client/NodeModel.hpp
@@ -23,11 +23,11 @@
 #include <iostream>
 #include <string>
 #include <sigc++/sigc++.h>
-#include "ObjectModel.h"
-#include "PortModel.h"
-#include <raul/Path.h>
-#include <raul/SharedPtr.h>
-#include "PluginModel.h"
+#include "ObjectModel.hpp"
+#include "PortModel.hpp"
+#include <raul/Path.hpp>
+#include <raul/SharedPtr.hpp>
+#include "PluginModel.hpp"
 
 using std::string; using std::map; using std::find;
 using std::cout; using std::cerr; using std::endl;
diff --git a/src/libs/client/OSCClientReceiver.cpp b/src/libs/client/OSCClientReceiver.cpp
index d56b8f2e..96533db2 100644
--- a/src/libs/client/OSCClientReceiver.cpp
+++ b/src/libs/client/OSCClientReceiver.cpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "OSCClientReceiver.h"
-#include <raul/AtomLiblo.h>
+#include "OSCClientReceiver.hpp"
+#include <raul/AtomLiblo.hpp>
 #include <list>
 #include <cassert>
 #include <cstring>
@@ -132,7 +132,7 @@ OSCClientReceiver::error_cb(int num, const char* msg, const char* path)
 int
 OSCClientReceiver::unknown_cb(const char* path, const char* types, lo_arg** argv, int argc, void* data, void* user_data)
 {
-	string msg = "Received unknown OSC message: ";
+	std::string msg = "Received unknown OSC message: ";
 	msg += path;
 
 	cerr << msg << endl;
diff --git a/src/libs/client/OSCClientReceiver.h b/src/libs/client/OSCClientReceiver.hpp
index 91bd3d09..b27e7f78 100644
--- a/src/libs/client/OSCClientReceiver.h
+++ b/src/libs/client/OSCClientReceiver.hpp
@@ -21,7 +21,7 @@
 #include <cstdlib>
 #include <boost/utility.hpp>
 #include <lo/lo.h>
-#include "interface/ClientInterface.h"
+#include "interface/ClientInterface.hpp"
 
 namespace Ingen {
 
@@ -69,8 +69,8 @@ public:
 	void start();
 	void stop();
 	
-	int    listen_port() { return _listen_port; }
-	string listen_url()  { return lo_server_thread_get_url(_st); }
+	int         listen_port() { return _listen_port; }
+	std::string listen_url()  { return lo_server_thread_get_url(_st); }
 	
 private:
 	void setup_callbacks();
diff --git a/src/libs/client/OSCEngineSender.cpp b/src/libs/client/OSCEngineSender.cpp
index 6ebf8df0..2e49eac3 100644
--- a/src/libs/client/OSCEngineSender.cpp
+++ b/src/libs/client/OSCEngineSender.cpp
@@ -16,9 +16,9 @@
  */
 
 #include <iostream>
-#include "OSCEngineSender.h"
-#include "interface/ClientKey.h"
-#include <raul/AtomLiblo.h>
+#include "OSCEngineSender.hpp"
+#include "interface/ClientKey.hpp"
+#include <raul/AtomLiblo.hpp>
 using std::cout; using std::cerr; using std::endl;
 
 namespace Ingen {
diff --git a/src/libs/client/OSCEngineSender.h b/src/libs/client/OSCEngineSender.hpp
index 68163ec6..c9b37ec8 100644
--- a/src/libs/client/OSCEngineSender.h
+++ b/src/libs/client/OSCEngineSender.hpp
@@ -21,8 +21,8 @@
 #include <inttypes.h>
 #include <string>
 #include <lo/lo.h>
-#include "interface/EngineInterface.h"
-#include "interface/Responder.h"
+#include "interface/EngineInterface.hpp"
+#include "interface/Responder.hpp"
 using std::string;
 using Ingen::Shared::EngineInterface;
 using Ingen::Shared::ClientInterface;
diff --git a/src/libs/client/ObjectModel.cpp b/src/libs/client/ObjectModel.cpp
index 7adc1edc..699d1ce7 100644
--- a/src/libs/client/ObjectModel.cpp
+++ b/src/libs/client/ObjectModel.cpp
@@ -15,7 +15,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "ObjectModel.h"
+#include "ObjectModel.hpp"
 
 namespace Ingen {
 namespace Client {
diff --git a/src/libs/client/ObjectModel.h b/src/libs/client/ObjectModel.hpp
index d388475a..03abafba 100644
--- a/src/libs/client/ObjectModel.h
+++ b/src/libs/client/ObjectModel.hpp
@@ -26,9 +26,9 @@
 #include <cassert>
 #include <boost/utility.hpp>
 #include <sigc++/sigc++.h>
-#include <raul/Atom.h>
-#include <raul/Path.h>
-#include <raul/SharedPtr.h>
+#include <raul/Atom.hpp>
+#include <raul/Path.hpp>
+#include <raul/SharedPtr.hpp>
 
 using std::string; using std::map; using std::find;
 using std::cout; using std::cerr; using std::endl;
diff --git a/src/libs/client/PatchModel.cpp b/src/libs/client/PatchModel.cpp
index 406dcbe9..85cf3dc7 100644
--- a/src/libs/client/PatchModel.cpp
+++ b/src/libs/client/PatchModel.cpp
@@ -15,9 +15,9 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "PatchModel.h"
-#include "NodeModel.h"
-#include "ConnectionModel.h"
+#include "PatchModel.hpp"
+#include "NodeModel.hpp"
+#include "ConnectionModel.hpp"
 #include <cassert>
 #include <iostream>
 
diff --git a/src/libs/client/PatchModel.h b/src/libs/client/PatchModel.hpp
index faceef72..55040858 100644
--- a/src/libs/client/PatchModel.h
+++ b/src/libs/client/PatchModel.hpp
@@ -23,9 +23,9 @@
 #include <string>
 #include <map>
 #include <sigc++/sigc++.h>
-#include "NodeModel.h"
-#include <raul/SharedPtr.h>
-#include "ConnectionModel.h"
+#include "NodeModel.hpp"
+#include <raul/SharedPtr.hpp>
+#include "ConnectionModel.hpp"
 
 using std::list; using std::string; using std::map;
 
diff --git a/src/libs/client/PluginModel.cpp b/src/libs/client/PluginModel.cpp
index c8d44837..886a2fa6 100644
--- a/src/libs/client/PluginModel.cpp
+++ b/src/libs/client/PluginModel.cpp
@@ -16,9 +16,9 @@
  */
 
 #include <sstream>
-#include <raul/Path.h>
-#include "PluginModel.h"
-#include "PatchModel.h"
+#include <raul/Path.hpp>
+#include "PluginModel.hpp"
+#include "PatchModel.hpp"
 
 
 namespace Ingen {
diff --git a/src/libs/client/PluginModel.h b/src/libs/client/PluginModel.hpp
index 6da388d6..f02528d1 100644
--- a/src/libs/client/PluginModel.h
+++ b/src/libs/client/PluginModel.hpp
@@ -21,8 +21,8 @@
 #include "../../../../config/config.h"
 #include <string>
 #include <iostream>
-#include <raul/Path.h>
-#include <raul/SharedPtr.h>
+#include <raul/Path.hpp>
+#include <raul/SharedPtr.hpp>
 #ifdef HAVE_SLV2
 #include <slv2/slv2.h>
 #endif
diff --git a/src/libs/client/PortModel.cpp b/src/libs/client/PortModel.cpp
index 9be019ed..af80e250 100644
--- a/src/libs/client/PortModel.cpp
+++ b/src/libs/client/PortModel.cpp
@@ -15,7 +15,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "PortModel.h"
+#include "PortModel.hpp"
 
 namespace Ingen {
 namespace Client {
diff --git a/src/libs/client/PortModel.h b/src/libs/client/PortModel.hpp
index c19db582..25573226 100644
--- a/src/libs/client/PortModel.h
+++ b/src/libs/client/PortModel.hpp
@@ -23,9 +23,9 @@
 #include <string>
 #include <list>
 #include <sigc++/sigc++.h>
-#include "ObjectModel.h"
-#include <raul/SharedPtr.h>
-#include <raul/Path.h>
+#include "ObjectModel.hpp"
+#include <raul/SharedPtr.hpp>
+#include <raul/Path.hpp>
 using std::string; using std::list; using std::cerr; using std::endl;
 
 namespace Ingen {
diff --git a/src/libs/client/PresetModel.h b/src/libs/client/PresetModel.hpp
index 69c42ed7..6cc557a5 100644
--- a/src/libs/client/PresetModel.h
+++ b/src/libs/client/PresetModel.hpp
@@ -20,7 +20,7 @@
 
 #include <string>
 #include <list>
-#include "ControlModel.h"
+#include "ControlModel.hpp"
 
 using std::string; using std::list;
 
diff --git a/src/libs/client/Serializer.cpp b/src/libs/client/Serializer.cpp
index a59ec6cf..f0920be5 100644
--- a/src/libs/client/Serializer.cpp
+++ b/src/libs/client/Serializer.cpp
@@ -28,20 +28,20 @@
 #include <boost/optional/optional.hpp>
 #include <cstring>
 #include <locale.h>
-#include <raul/RDFWorld.h>
-#include <raul/RDFModel.h>
-#include <raul/RDFNode.h>
-#include <raul/Path.h>
-#include <raul/Atom.h>
-#include <raul/AtomRedland.h>
-#include "interface/EngineInterface.h"
-#include "Serializer.h"
-#include "PatchModel.h"
-#include "NodeModel.h"
-#include "ConnectionModel.h"
-#include "PortModel.h"
-#include "PresetModel.h"
-#include "PluginModel.h"
+#include <raul/RDFWorld.hpp>
+#include <raul/RDFModel.hpp>
+#include <raul/RDFNode.hpp>
+#include <raul/Path.hpp>
+#include <raul/Atom.hpp>
+#include <raul/AtomRedland.hpp>
+#include "interface/EngineInterface.hpp"
+#include "Serializer.hpp"
+#include "PatchModel.hpp"
+#include "NodeModel.hpp"
+#include "ConnectionModel.hpp"
+#include "PortModel.hpp"
+#include "PresetModel.hpp"
+#include "PluginModel.hpp"
 
 using namespace std;
 using namespace Raul;
diff --git a/src/libs/client/Serializer.h b/src/libs/client/Serializer.hpp
index 6095cb25..a42d99fa 100644
--- a/src/libs/client/Serializer.h
+++ b/src/libs/client/Serializer.hpp
@@ -23,12 +23,12 @@
 #include <string>
 #include <stdexcept>
 #include <cassert>
-#include <raul/SharedPtr.h>
-#include <raul/Path.h>
-#include <raul/Atom.h>
-#include <raul/RDFWorld.h>
-#include <raul/RDFModel.h>
-#include "ObjectModel.h"
+#include <raul/SharedPtr.hpp>
+#include <raul/Path.hpp>
+#include <raul/Atom.hpp>
+#include <raul/RDFWorld.hpp>
+#include <raul/RDFModel.hpp>
+#include "ObjectModel.hpp"
 
 namespace Ingen {
 namespace Client {
diff --git a/src/libs/client/SigClientInterface.h b/src/libs/client/SigClientInterface.hpp
index a7f7761b..f19f4a5e 100644
--- a/src/libs/client/SigClientInterface.h
+++ b/src/libs/client/SigClientInterface.hpp
@@ -21,7 +21,7 @@
 #include <inttypes.h>
 #include <string>
 #include <sigc++/sigc++.h>
-#include "interface/ClientInterface.h"
+#include "interface/ClientInterface.hpp"
 using std::string;
 
 namespace Ingen {
diff --git a/src/libs/client/Store.cpp b/src/libs/client/Store.cpp
index 5a989c3c..61c02698 100644
--- a/src/libs/client/Store.cpp
+++ b/src/libs/client/Store.cpp
@@ -15,14 +15,14 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "Store.h"
-#include "ObjectModel.h"
-#include "PatchModel.h"
-#include "NodeModel.h"
-#include "PortModel.h"
-#include "PluginModel.h"
-#include "PatchModel.h"
-#include "SigClientInterface.h"
+#include "Store.hpp"
+#include "ObjectModel.hpp"
+#include "PatchModel.hpp"
+#include "NodeModel.hpp"
+#include "PortModel.hpp"
+#include "PluginModel.hpp"
+#include "PatchModel.hpp"
+#include "SigClientInterface.hpp"
 
 namespace Ingen {
 namespace Client {
diff --git a/src/libs/client/Store.h b/src/libs/client/Store.hpp
index e481fc2d..38814200 100644
--- a/src/libs/client/Store.h
+++ b/src/libs/client/Store.hpp
@@ -22,11 +22,11 @@
 #include <string>
 #include <map>
 #include <list>
-#include <raul/SharedPtr.h>
+#include <raul/SharedPtr.hpp>
 #include <sigc++/sigc++.h>
-#include <raul/Path.h>
-#include <raul/Atom.h>
-#include "interface/EngineInterface.h"
+#include <raul/Path.hpp>
+#include <raul/Atom.hpp>
+#include "interface/EngineInterface.hpp"
 using std::string; using std::map; using std::list;
 using Ingen::Shared::EngineInterface;
 using Raul::Path;
diff --git a/src/libs/client/ThreadedSigClientInterface.cpp b/src/libs/client/ThreadedSigClientInterface.cpp
index 6d4ac074..3b7af80c 100644
--- a/src/libs/client/ThreadedSigClientInterface.cpp
+++ b/src/libs/client/ThreadedSigClientInterface.cpp
@@ -15,7 +15,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "ThreadedSigClientInterface.h"
+#include "ThreadedSigClientInterface.hpp"
 #include <iostream>
 using std::cerr; using std::endl;
 
diff --git a/src/libs/client/ThreadedSigClientInterface.h b/src/libs/client/ThreadedSigClientInterface.hpp
index d0cb4e89..b6908a1c 100644
--- a/src/libs/client/ThreadedSigClientInterface.h
+++ b/src/libs/client/ThreadedSigClientInterface.hpp
@@ -21,10 +21,10 @@
 #include <inttypes.h>
 #include <string>
 #include <sigc++/sigc++.h>
-#include "interface/ClientInterface.h"
-#include "SigClientInterface.h"
-#include <raul/SRSWQueue.h>
-#include <raul/Atom.h>
+#include "interface/ClientInterface.hpp"
+#include "SigClientInterface.hpp"
+#include <raul/SRSWQueue.hpp>
+#include <raul/Atom.hpp>
 using std::string;
 
 /** Returns nothing and takes no parameters (because they have all been bound) */
diff --git a/src/libs/client/client.cpp b/src/libs/client/client.cpp
index da28a342..8b86e958 100644
--- a/src/libs/client/client.cpp
+++ b/src/libs/client/client.cpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "client.h"
-#include "OSCEngineSender.h"
+#include "client.hpp"
+#include "OSCEngineSender.hpp"
 
 namespace Ingen {
 namespace Client {
diff --git a/src/libs/client/client.h b/src/libs/client/client.hpp
index fa4ad6c9..931e4c45 100644
--- a/src/libs/client/client.h
+++ b/src/libs/client/client.hpp
@@ -18,7 +18,7 @@
 #ifndef INGEN_CLIENT_H
 #define INGEN_CLIENT_H
 
-#include <raul/SharedPtr.h>
+#include <raul/SharedPtr.hpp>
 
 namespace Ingen {
 
diff --git a/src/libs/engine/AudioBuffer.cpp b/src/libs/engine/AudioBuffer.cpp
index 1e865dbe..f05048ad 100644
--- a/src/libs/engine/AudioBuffer.cpp
+++ b/src/libs/engine/AudioBuffer.cpp
@@ -18,8 +18,9 @@
 #include <iostream>
 #include <cassert>
 #include <stdlib.h>
-#include "AudioBuffer.h"
-using std::cerr; using std::endl;
+#include "AudioBuffer.hpp"
+
+using namespace std;
 
 /* TODO: Be sure these functions are vectorized by GCC when it's vectorizer
  * stops sucking.  Probably a good idea to inline them as well */
diff --git a/src/libs/engine/AudioBuffer.h b/src/libs/engine/AudioBuffer.hpp
index eba25c83..ee277313 100644
--- a/src/libs/engine/AudioBuffer.h
+++ b/src/libs/engine/AudioBuffer.hpp
@@ -21,8 +21,8 @@
 #include <cstddef>
 #include <cassert>
 #include <boost/utility.hpp>
-#include "types.h"
-#include "Buffer.h"
+#include "types.hpp"
+#include "Buffer.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/AudioDriver.h b/src/libs/engine/AudioDriver.hpp
index d9807939..bc7d1ee9 100644
--- a/src/libs/engine/AudioDriver.h
+++ b/src/libs/engine/AudioDriver.hpp
@@ -18,11 +18,11 @@
 #ifndef AUDIODRIVER_H
 #define AUDIODRIVER_H
 
-#include <raul/List.h>
-#include <raul/Path.h>
-#include "Driver.h"
-#include "types.h"
-#include "DataType.h"
+#include <raul/List.hpp>
+#include <raul/Path.hpp>
+#include "Driver.hpp"
+#include "types.hpp"
+#include "DataType.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/Buffer.h b/src/libs/engine/Buffer.hpp
index b27c3a86..d4b52465 100644
--- a/src/libs/engine/Buffer.h
+++ b/src/libs/engine/Buffer.hpp
@@ -21,8 +21,8 @@
 #include <cstddef>
 #include <cassert>
 #include <boost/utility.hpp>
-#include "types.h"
-#include "DataType.h"
+#include "types.hpp"
+#include "DataType.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/BufferFactory.cpp b/src/libs/engine/BufferFactory.cpp
index 48db9261..8c84fb81 100644
--- a/src/libs/engine/BufferFactory.cpp
+++ b/src/libs/engine/BufferFactory.cpp
@@ -15,10 +15,10 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "BufferFactory.h"
-#include "AudioBuffer.h"
-#include "MidiBuffer.h"
-#include "OSCBuffer.h"
+#include "BufferFactory.hpp"
+#include "AudioBuffer.hpp"
+#include "MidiBuffer.hpp"
+#include "OSCBuffer.hpp"
 
 namespace Ingen {
 namespace BufferFactory {
diff --git a/src/libs/engine/BufferFactory.h b/src/libs/engine/BufferFactory.hpp
index 1887c27c..bac49c46 100644
--- a/src/libs/engine/BufferFactory.h
+++ b/src/libs/engine/BufferFactory.hpp
@@ -18,7 +18,7 @@
 #ifndef BUFFERFACTORY_H
 #define BUFFERFACTORY_H
 
-#include "Buffer.h"
+#include "Buffer.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/ClientBroadcaster.cpp b/src/libs/engine/ClientBroadcaster.cpp
index 25a289c8..311e8792 100644
--- a/src/libs/engine/ClientBroadcaster.cpp
+++ b/src/libs/engine/ClientBroadcaster.cpp
@@ -15,24 +15,25 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "ClientBroadcaster.h"
 #include <cassert>
 #include <iostream>
 #include <unistd.h>
-#include "ObjectStore.h"
-#include "NodeFactory.h"
-#include "util.h"
-#include "Patch.h"
-#include "Node.h"
-#include "Plugin.h"
-#include "Port.h"
-#include "Connection.h"
-#include "AudioDriver.h"
-#include "ObjectSender.h"
-#include "interface/ClientKey.h"
-#include "interface/ClientInterface.h"
-#include "OSCClientSender.h"
-using std::cout; using std::cerr; using std::endl;
+#include "interface/ClientKey.hpp"
+#include "interface/ClientInterface.hpp"
+#include "ClientBroadcaster.hpp"
+#include "ObjectStore.hpp"
+#include "NodeFactory.hpp"
+#include "util.hpp"
+#include "Patch.hpp"
+#include "Node.hpp"
+#include "Plugin.hpp"
+#include "Port.hpp"
+#include "Connection.hpp"
+#include "AudioDriver.hpp"
+#include "ObjectSender.hpp"
+#include "OSCClientSender.hpp"
+
+using namespace std;
 using Ingen::Shared::ClientInterface;
 
 namespace Ingen {
diff --git a/src/libs/engine/ClientBroadcaster.h b/src/libs/engine/ClientBroadcaster.hpp
index cef7b397..87e321bb 100644
--- a/src/libs/engine/ClientBroadcaster.h
+++ b/src/libs/engine/ClientBroadcaster.hpp
@@ -24,9 +24,9 @@
 #include <list>
 #include <lo/lo.h>
 #include <pthread.h>
-#include <raul/SharedPtr.h>
-#include "interface/ClientInterface.h"
-#include "types.h"
+#include <raul/SharedPtr.hpp>
+#include "interface/ClientInterface.hpp"
+#include "types.hpp"
 
 using std::list; using std::string; using std::pair;
 
diff --git a/src/libs/engine/Connection.cpp b/src/libs/engine/Connection.cpp
index a4795ceb..9341b603 100644
--- a/src/libs/engine/Connection.cpp
+++ b/src/libs/engine/Connection.cpp
@@ -16,12 +16,12 @@
  */
 
 #include <algorithm>
-#include "Connection.h"
-#include "util.h"
-#include "Node.h"
-#include "Port.h"
-#include "BufferFactory.h"
-#include "AudioBuffer.h"
+#include "util.hpp"
+#include "Connection.hpp"
+#include "Node.hpp"
+#include "Port.hpp"
+#include "BufferFactory.hpp"
+#include "AudioBuffer.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/Connection.h b/src/libs/engine/Connection.hpp
index 7d109d88..816efe6c 100644
--- a/src/libs/engine/Connection.h
+++ b/src/libs/engine/Connection.hpp
@@ -20,10 +20,10 @@
 
 #include <cstdlib>
 #include <boost/utility.hpp>
-#include <raul/Deletable.h>
-#include "DataType.h"
-#include "Port.h"
-#include "types.h"
+#include <raul/Deletable.hpp>
+#include "DataType.hpp"
+#include "Port.hpp"
+#include "types.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/Controller.h b/src/libs/engine/Controller.hpp
index 95f7cc44..95f7cc44 100644
--- a/src/libs/engine/Controller.h
+++ b/src/libs/engine/Controller.hpp
diff --git a/src/libs/engine/DSSINode.cpp b/src/libs/engine/DSSINode.cpp
index 53af15ef..69aff132 100644
--- a/src/libs/engine/DSSINode.cpp
+++ b/src/libs/engine/DSSINode.cpp
@@ -15,14 +15,14 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "DSSINode.h"
+#include "DSSINode.hpp"
 #include <map>
 #include <set>
-#include "ClientBroadcaster.h"
-#include "interface/ClientInterface.h"
-#include "InputPort.h"
-#include "types.h"
-#include "AudioBuffer.h"
+#include "ClientBroadcaster.hpp"
+#include "interface/ClientInterface.hpp"
+#include "InputPort.hpp"
+#include "types.hpp"
+#include "AudioBuffer.hpp"
 
 using namespace std;
 
diff --git a/src/libs/engine/DSSINode.h b/src/libs/engine/DSSINode.hpp
index d569e720..f54e75f8 100644
--- a/src/libs/engine/DSSINode.h
+++ b/src/libs/engine/DSSINode.hpp
@@ -21,8 +21,8 @@
 #include <alsa/asoundlib.h>
 #include <dssi.h>
 #include <lo/lo.h>
-#include "LADSPANode.h"
-#include "MidiBuffer.h"
+#include "LADSPANode.hpp"
+#include "MidiBuffer.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/DataType.h b/src/libs/engine/DataType.hpp
index 1f431edd..1f431edd 100644
--- a/src/libs/engine/DataType.h
+++ b/src/libs/engine/DataType.hpp
diff --git a/src/libs/engine/DirectResponder.h b/src/libs/engine/DirectResponder.hpp
index 1eceb80e..739cd017 100644
--- a/src/libs/engine/DirectResponder.h
+++ b/src/libs/engine/DirectResponder.hpp
@@ -18,9 +18,9 @@
 #ifndef DIRECTRESPONDER_H
 #define DIRECTRESPONDER_H
 
-#include <raul/SharedPtr.h>
-#include "interface/ClientInterface.h"
-#include "interface/Responder.h"
+#include <raul/SharedPtr.hpp>
+#include "interface/ClientInterface.hpp"
+#include "interface/Responder.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/Driver.h b/src/libs/engine/Driver.hpp
index bb65fe9b..786b7775 100644
--- a/src/libs/engine/Driver.h
+++ b/src/libs/engine/Driver.hpp
@@ -20,8 +20,8 @@
 
 #include <string>
 #include <boost/utility.hpp>
-#include <raul/Path.h>
-#include "DataType.h"
+#include <raul/Path.hpp>
+#include "DataType.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/DuplexPort.cpp b/src/libs/engine/DuplexPort.cpp
index a71f18b8..6558c587 100644
--- a/src/libs/engine/DuplexPort.cpp
+++ b/src/libs/engine/DuplexPort.cpp
@@ -15,17 +15,16 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "DuplexPort.h"
 #include <iostream>
 #include <cstdlib>
 #include <cassert>
-#include "Connection.h"
-#include "OutputPort.h"
-#include "Node.h"
-#include "util.h"
-
-using std::cerr; using std::cout; using std::endl;
+#include "util.hpp"
+#include "DuplexPort.hpp"
+#include "Connection.hpp"
+#include "OutputPort.hpp"
+#include "Node.hpp"
 
+using namespace std;
 
 namespace Ingen {
 
diff --git a/src/libs/engine/DuplexPort.h b/src/libs/engine/DuplexPort.hpp
index 986c1862..3abb4549 100644
--- a/src/libs/engine/DuplexPort.h
+++ b/src/libs/engine/DuplexPort.hpp
@@ -19,12 +19,11 @@
 #define DUPLEXPORT_H
 
 #include <string>
-#include "types.h"
-#include <raul/Array.h>
-#include "Buffer.h"
-#include "InputPort.h"
-#include "OutputPort.h"
-using std::string;
+#include <raul/Array.hpp>
+#include "types.hpp"
+#include "Buffer.hpp"
+#include "InputPort.hpp"
+#include "OutputPort.hpp"
 
 namespace Ingen {
 	
@@ -42,7 +41,7 @@ class Node;
 class DuplexPort : public InputPort, public OutputPort
 {
 public:
-	DuplexPort(Node* parent, const string& name, size_t index, size_t poly, DataType type, size_t buffer_size, bool is_output);
+	DuplexPort(Node* parent, const std::string& name, size_t index, size_t poly, DataType type, size_t buffer_size, bool is_output);
 	virtual ~DuplexPort() {}
 
 	void pre_process(SampleCount nframes, FrameTime start, FrameTime end);
diff --git a/src/libs/engine/Engine.cpp b/src/libs/engine/Engine.cpp
index a2bfc757..69f7ebe0 100644
--- a/src/libs/engine/Engine.cpp
+++ b/src/libs/engine/Engine.cpp
@@ -16,32 +16,32 @@
  */
 
 #include <cassert>
-#include "Engine.h"	
-#include "config.h"
-#include "tuning.h"
 #include <sys/mman.h>
 #include <iostream>
 #include <unistd.h>
-#include <raul/Deletable.h>
-#include <raul/Maid.h>
-#include "Event.h"
-#include "JackAudioDriver.h"
-#include "NodeFactory.h"
-#include "ClientBroadcaster.h"
-#include "Patch.h"
-#include "ObjectStore.h"
-#include "MidiDriver.h"
-#include "OSCDriver.h"
-#include "QueuedEventSource.h"
-#include "PostProcessor.h"
-#include "CreatePatchEvent.h"
-#include "EnablePatchEvent.h"
-#include "OSCEngineReceiver.h"
+#include <raul/Deletable.hpp>
+#include <raul/Maid.hpp>
+#include "Engine.hpp"	
+#include "../../../../config/config.h"
+#include "tuning.hpp"
+#include "Event.hpp"
+#include "JackAudioDriver.hpp"
+#include "NodeFactory.hpp"
+#include "ClientBroadcaster.hpp"
+#include "Patch.hpp"
+#include "ObjectStore.hpp"
+#include "MidiDriver.hpp"
+#include "OSCDriver.hpp"
+#include "QueuedEventSource.hpp"
+#include "PostProcessor.hpp"
+#include "CreatePatchEvent.hpp"
+#include "EnablePatchEvent.hpp"
+#include "OSCEngineReceiver.hpp"
 #ifdef HAVE_JACK_MIDI
-#include "JackMidiDriver.h"
+#include "JackMidiDriver.hpp"
 #endif
 /*#ifdef HAVE_LASH
-#include "LashDriver.h"
+#include "LashDriver.hpp"
 #endif*/
 using namespace std;
 
diff --git a/src/libs/engine/Engine.h b/src/libs/engine/Engine.hpp
index 6fe61582..b9780501 100644
--- a/src/libs/engine/Engine.h
+++ b/src/libs/engine/Engine.hpp
@@ -20,8 +20,8 @@
 
 #include <cassert>
 #include <boost/utility.hpp>
-#include <raul/SharedPtr.h>
-#include "DataType.h"
+#include <raul/SharedPtr.hpp>
+#include "DataType.hpp"
 
 template<typename T> class Queue;
 
diff --git a/src/libs/engine/Event.h b/src/libs/engine/Event.hpp
index 01b14abc..8814cbae 100644
--- a/src/libs/engine/Event.h
+++ b/src/libs/engine/Event.hpp
@@ -19,11 +19,11 @@
 #define EVENT_H
 
 #include <cassert>
-#include <raul/SharedPtr.h>
-#include <raul/Deletable.h>
-#include "interface/Responder.h"
-#include "types.h"
-#include "ThreadManager.h"
+#include <raul/SharedPtr.hpp>
+#include <raul/Deletable.hpp>
+#include "interface/Responder.hpp"
+#include "types.hpp"
+#include "ThreadManager.hpp"
 
 namespace Raul { class Path; }
 using Raul::Path;
diff --git a/src/libs/engine/EventSource.h b/src/libs/engine/EventSource.hpp
index 15b926e9..2bf40527 100644
--- a/src/libs/engine/EventSource.h
+++ b/src/libs/engine/EventSource.hpp
@@ -18,7 +18,7 @@
 #ifndef EVENTSOURCE_H
 #define EVENTSOURCE_H
 
-#include "types.h"
+#include "types.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/GraphObject.cpp b/src/libs/engine/GraphObject.cpp
index e8af813f..48a513bc 100644
--- a/src/libs/engine/GraphObject.cpp
+++ b/src/libs/engine/GraphObject.cpp
@@ -15,9 +15,9 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "GraphObject.h"
-#include "Patch.h"
-#include "ObjectStore.h"
+#include "GraphObject.hpp"
+#include "Patch.hpp"
+#include "ObjectStore.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/GraphObject.h b/src/libs/engine/GraphObject.hpp
index c5993595..d5ffb4b8 100644
--- a/src/libs/engine/GraphObject.h
+++ b/src/libs/engine/GraphObject.hpp
@@ -22,10 +22,10 @@
 #include <map>
 #include <cstddef>
 #include <cassert>
-#include <raul/Deletable.h>
-#include <raul/Path.h>
-#include <raul/Atom.h>
-#include "types.h"
+#include <raul/Deletable.hpp>
+#include <raul/Path.hpp>
+#include <raul/Atom.hpp>
+#include "types.hpp"
 
 using std::string;
 using Raul::Atom;
diff --git a/src/libs/engine/InputPort.cpp b/src/libs/engine/InputPort.cpp
index 349175eb..743ef88c 100644
--- a/src/libs/engine/InputPort.cpp
+++ b/src/libs/engine/InputPort.cpp
@@ -15,15 +15,15 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "InputPort.h"
+#include "InputPort.hpp"
 #include <iostream>
 #include <cstdlib>
 #include <cassert>
-#include "AudioBuffer.h"
-#include "Connection.h"
-#include "OutputPort.h"
-#include "Node.h"
-#include "util.h"
+#include "AudioBuffer.hpp"
+#include "Connection.hpp"
+#include "OutputPort.hpp"
+#include "Node.hpp"
+#include "util.hpp"
 
 using std::cerr; using std::cout; using std::endl;
 
diff --git a/src/libs/engine/InputPort.h b/src/libs/engine/InputPort.hpp
index e0367025..1305e239 100644
--- a/src/libs/engine/InputPort.h
+++ b/src/libs/engine/InputPort.hpp
@@ -21,9 +21,9 @@
 #include <string>
 #include <cstdlib>
 #include <cassert>
-#include <raul/List.h>
-#include "Port.h"
-#include "MidiBuffer.h"
+#include <raul/List.hpp>
+#include "Port.hpp"
+#include "MidiBuffer.hpp"
 using std::string;
 
 namespace Ingen {
diff --git a/src/libs/engine/InternalNode.h b/src/libs/engine/InternalNode.hpp
index 7f7d54fe..b00cd8cb 100644
--- a/src/libs/engine/InternalNode.h
+++ b/src/libs/engine/InternalNode.hpp
@@ -19,9 +19,9 @@
 #define INTERNALNODE_H
 
 #include <cstdlib>
-#include "NodeBase.h"
-#include "Plugin.h"
-#include "types.h"
+#include "NodeBase.hpp"
+#include "Plugin.hpp"
+#include "types.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/JackAudioDriver.cpp b/src/libs/engine/JackAudioDriver.cpp
index 3f6f58c0..25f8305d 100644
--- a/src/libs/engine/JackAudioDriver.cpp
+++ b/src/libs/engine/JackAudioDriver.cpp
@@ -15,28 +15,28 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "JackAudioDriver.h"
-#include "config.h"
-#include "tuning.h"
+#include "JackAudioDriver.hpp"
+#include "../../../../config/config.h"
+#include "tuning.hpp"
 #include <iostream>
 #include <cstdlib>
-#include <raul/List.h>
-#include "Engine.h"
-#include "util.h"
-#include "Event.h"
-#include "ThreadManager.h"
-#include "QueuedEvent.h"
-#include "EventSource.h"
-#include "PostProcessor.h"
-#include "Node.h"
-#include "Patch.h"
-#include "Port.h"
-#include "MidiDriver.h"
-#include "DuplexPort.h"
-#include "EventSource.h"
-#include "AudioBuffer.h"
+#include <raul/List.hpp>
+#include "Engine.hpp"
+#include "util.hpp"
+#include "Event.hpp"
+#include "ThreadManager.hpp"
+#include "QueuedEvent.hpp"
+#include "EventSource.hpp"
+#include "PostProcessor.hpp"
+#include "Node.hpp"
+#include "Patch.hpp"
+#include "Port.hpp"
+#include "MidiDriver.hpp"
+#include "DuplexPort.hpp"
+#include "EventSource.hpp"
+#include "AudioBuffer.hpp"
 /*#ifdef HAVE_LASH
-#include "LashDriver.h"
+#include "LashDriver.hpp"
 #endif*/
 
 using namespace std;
diff --git a/src/libs/engine/JackAudioDriver.h b/src/libs/engine/JackAudioDriver.hpp
index a54b4a88..583d2c62 100644
--- a/src/libs/engine/JackAudioDriver.h
+++ b/src/libs/engine/JackAudioDriver.hpp
@@ -20,11 +20,11 @@
 
 #include <jack/jack.h>
 #include <jack/transport.h>
-#include <raul/Thread.h>
-#include <raul/Path.h>
-#include <raul/List.h>
-#include "AudioDriver.h"
-#include "Buffer.h"
+#include <raul/Thread.hpp>
+#include <raul/Path.hpp>
+#include <raul/List.hpp>
+#include "AudioDriver.hpp"
+#include "Buffer.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/JackMidiDriver.cpp b/src/libs/engine/JackMidiDriver.cpp
index f8ed3064..8c328844 100644
--- a/src/libs/engine/JackMidiDriver.cpp
+++ b/src/libs/engine/JackMidiDriver.cpp
@@ -18,17 +18,17 @@
 #include <iostream>
 #include <cstdlib>
 #include <pthread.h>
-#include <raul/Maid.h>
+#include <raul/Maid.hpp>
 #include <raul/midi_events.h>
-#include "types.h"
-#include "JackMidiDriver.h"
-#include "ThreadManager.h"
-#include "AudioDriver.h"
-#include "MidiBuffer.h"
-#include "DuplexPort.h"
+#include "types.hpp"
+#include "JackMidiDriver.hpp"
+#include "ThreadManager.hpp"
+#include "AudioDriver.hpp"
+#include "MidiBuffer.hpp"
+#include "DuplexPort.hpp"
 #include "jack_compat.h"
 /*#ifdef HAVE_LASH
-#include "LashDriver.h"
+#include "LashDriver.hpp"
 #endif*/
 using namespace std;
 
diff --git a/src/libs/engine/JackMidiDriver.h b/src/libs/engine/JackMidiDriver.hpp
index 535a1f22..631f0d28 100644
--- a/src/libs/engine/JackMidiDriver.h
+++ b/src/libs/engine/JackMidiDriver.hpp
@@ -20,9 +20,9 @@
 
 #include <jack/jack.h>
 #include <jack/midiport.h>
-#include <raul/List.h>
-#include "config.h"
-#include "MidiDriver.h"
+#include <raul/List.hpp>
+#include "../../../../config/config.h"
+#include "MidiDriver.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/LADSPANode.cpp b/src/libs/engine/LADSPANode.cpp
index 957c49dd..9f030aee 100644
--- a/src/libs/engine/LADSPANode.cpp
+++ b/src/libs/engine/LADSPANode.cpp
@@ -15,15 +15,15 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "LADSPANode.h"
+#include "LADSPANode.hpp"
 #include <iostream>
 #include <cassert>
 #include <stdint.h>
 #include <cmath>
-#include "AudioBuffer.h"
-#include "InputPort.h"
-#include "OutputPort.h"
-#include "Plugin.h"
+#include "AudioBuffer.hpp"
+#include "InputPort.hpp"
+#include "OutputPort.hpp"
+#include "Plugin.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/LADSPANode.h b/src/libs/engine/LADSPANode.hpp
index ff813f4c..c71e68fb 100644
--- a/src/libs/engine/LADSPANode.h
+++ b/src/libs/engine/LADSPANode.hpp
@@ -20,9 +20,9 @@
 
 #include <string>
 #include <ladspa.h>
-#include "types.h"
-#include "NodeBase.h"
-#include "Plugin.h"
+#include "types.hpp"
+#include "NodeBase.hpp"
+#include "Plugin.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/LV2Node.cpp b/src/libs/engine/LV2Node.cpp
index 888366136..8c3ea933 100644
--- a/src/libs/engine/LV2Node.cpp
+++ b/src/libs/engine/LV2Node.cpp
@@ -15,18 +15,18 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "LV2Node.h"
+#include "LV2Node.hpp"
 #include <iostream>
 #include <cassert>
-#include "float.h"
+#include <float.h>
 #include <stdint.h>
 #include <cmath>
-#include "InputPort.h"
-#include "OutputPort.h"
-#include "Plugin.h"
-#include "AudioBuffer.h"
-#include "MidiBuffer.h"
-#include "OSCBuffer.h"
+#include "InputPort.hpp"
+#include "OutputPort.hpp"
+#include "Plugin.hpp"
+#include "AudioBuffer.hpp"
+#include "MidiBuffer.hpp"
+#include "OSCBuffer.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/LV2Node.h b/src/libs/engine/LV2Node.hpp
index 39b06939..361df02e 100644
--- a/src/libs/engine/LV2Node.h
+++ b/src/libs/engine/LV2Node.hpp
@@ -20,9 +20,9 @@
 
 #include <string>
 #include <slv2/slv2.h>
-#include "types.h"
-#include "NodeBase.h"
-#include "Plugin.h"
+#include "types.hpp"
+#include "NodeBase.hpp"
+#include "Plugin.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/LashDriver.cpp b/src/libs/engine/LashDriver.cpp
index 452af1f0..f4f37abb 100644
--- a/src/libs/engine/LashDriver.cpp
+++ b/src/libs/engine/LashDriver.cpp
@@ -18,9 +18,9 @@
 #include <iostream>
 #include <string>
 #include <cassert>
-#include "config/config.h"
-#include "LashDriver.h"
-#include "App.h"
+#include "../../../../config/config.h"
+#include "LashDriver.hpp"
+#include "App.hpp"
 
 using namespace std;
 
diff --git a/src/libs/engine/LashDriver.h b/src/libs/engine/LashDriver.hpp
index 4b93749c..4b93749c 100644
--- a/src/libs/engine/LashDriver.h
+++ b/src/libs/engine/LashDriver.hpp
diff --git a/src/libs/engine/Makefile.am b/src/libs/engine/Makefile.am
index 0d4921de..aafb18b6 100644
--- a/src/libs/engine/Makefile.am
+++ b/src/libs/engine/Makefile.am
@@ -19,194 +19,180 @@ libingen_engine_la_LIBADD = @RAUL_LIBS@ @JACK_LIBS@ @LIBLO_LIBS@ @ALSA_LIBS@ @LA
 AM_CFLAGS=-std=c99
 
 libingen_engine_la_SOURCES = \
-	engine.h \
-	engine.cpp \
-	util.h \
-	tuning.h \
-	events.h \
-	ThreadManager.h \
-	DataType.h \
-	Node.h \
-	NodeBase.h \
-	NodeBase.cpp \
-	InternalNode.h \
-	Patch.h \
-	Patch.cpp \
-	NodeFactory.h \
-	NodeFactory.cpp \
-	Engine.h \
+	../../../../lv2/extensions/osc/lv2_osc.c \
+	../../../../lv2/extensions/osc/lv2_osc_print.c \
+	AudioBuffer.cpp \
+	AudioBuffer.hpp \
+	AudioDriver.hpp \
+	Buffer.hpp \
+	BufferFactory.cpp \
+	BufferFactory.hpp \
+	ClientBroadcaster.cpp \
+	ClientBroadcaster.hpp \
+	Connection.cpp \
+	Connection.hpp \
+	DataType.hpp \
+	DirectResponder.hpp \
+	Driver.hpp \
+	DuplexPort.cpp \
+	DuplexPort.hpp \
 	Engine.cpp \
-	JackAudioDriver.h \
+	Engine.hpp \
+	Event.hpp \
+	EventSource.hpp \
+	GraphObject.cpp \
+	GraphObject.hpp \
+	InputPort.cpp \
+	InputPort.hpp \
+	InternalNode.hpp \
 	JackAudioDriver.cpp \
-	JackMidiDriver.h \
+	JackAudioDriver.hpp \
 	JackMidiDriver.cpp \
-	jack_compat.h \
-	OSCEngineReceiver.h \
+	JackMidiDriver.hpp \
+	MidiBuffer.cpp \
+	MidiBuffer.hpp \
+	MidiControlNode.cpp \
+	MidiControlNode.hpp \
+	MidiDriver.hpp \
+	MidiNoteNode.cpp \
+	MidiNoteNode.hpp \
+	MidiTriggerNode.cpp \
+	MidiTriggerNode.hpp \
+	Node.hpp \
+	NodeBase.cpp \
+	NodeBase.hpp \
+	NodeFactory.cpp \
+	NodeFactory.hpp \
+	OSCBuffer.cpp \
+	OSCBuffer.hpp \
+	OSCClientSender.cpp \
+	OSCClientSender.hpp \
+	OSCDriver.hpp \
 	OSCEngineReceiver.cpp \
-	DirectResponder.h \
-	OSCResponder.h \
+	OSCEngineReceiver.hpp \
 	OSCResponder.cpp \
-	ClientBroadcaster.h \
-	ClientBroadcaster.cpp \
-	ObjectSender.h \
+	OSCResponder.hpp \
 	ObjectSender.cpp \
-	OSCClientSender.h \
-	OSCClientSender.cpp \
-	Buffer.h \
-	AudioBuffer.h \
-	AudioBuffer.cpp \
-	MidiBuffer.h \
-	MidiBuffer.cpp \
-	OSCBuffer.h \
-	OSCBuffer.cpp \
-	../../../../lv2/extensions/osc/lv2_osc.c \
-	../../../../lv2/extensions/osc/lv2_osc_print.c \
-	BufferFactory.h \
-	BufferFactory.cpp \
-	Port.h \
-	Port.cpp \
-	InputPort.h \
-	InputPort.cpp \
-	OutputPort.h \
+	ObjectSender.hpp \
+	ObjectStore.cpp \
+	ObjectStore.hpp \
 	OutputPort.cpp \
-	DuplexPort.h \
-	DuplexPort.cpp \
-	MidiNoteNode.h \
-	MidiNoteNode.cpp \
-	MidiTriggerNode.h \
-	MidiTriggerNode.cpp \
-	MidiControlNode.h \
-	MidiControlNode.cpp \
-	Event.h \
-	QueuedEvent.h \
-	EventSource.h \
-	QueuedEventSource.h \
-	QueuedEventSource.cpp \
-	QueuedEngineInterface.h \
-	QueuedEngineInterface.cpp \
-	GraphObject.h \
-	GraphObject.cpp \
-	Tree.h \
-	TreeImplementation.h \
-	Plugin.h \
+	OutputPort.hpp \
+	Patch.cpp \
+	Patch.hpp \
 	Plugin.cpp \
-	PostProcessor.h \
+	Plugin.hpp \
+	Port.cpp \
+	Port.hpp \
 	PostProcessor.cpp \
-	Connection.h \
-	Connection.cpp \
-	ObjectStore.h \
-	ObjectStore.cpp \
-	TransportNode.h \
+	PostProcessor.hpp \
+	QueuedEngineInterface.cpp \
+	QueuedEngineInterface.hpp \
+	QueuedEvent.hpp \
+	QueuedEventSource.cpp \
+	QueuedEventSource.hpp \
+	ThreadManager.hpp \
 	TransportNode.cpp \
-	Driver.h \
-	AudioDriver.h \
-	MidiDriver.h \
-	OSCDriver.h \
-	instantiations.cpp \
-	events/RegisterClientEvent.h \
-	events/RegisterClientEvent.cpp \
-	events/UnregisterClientEvent.h \
-	events/UnregisterClientEvent.cpp \
-	events/PingQueuedEvent.h \
-	events/DeactivateEvent.h \
-	events/DeactivateEvent.cpp \
-	events/SetPortValueEvent.h \
-	events/SetPortValueEvent.cpp \
-	events/SetPortValueQueuedEvent.h \
-	events/SetPortValueQueuedEvent.cpp \
-	events/NoteOnEvent.h \
-	events/NoteOnEvent.cpp \
-	events/NoteOffEvent.h \
-	events/NoteOffEvent.cpp \
-	events/AllNotesOffEvent.h \
+	TransportNode.hpp \
+	Tree.hpp \
+	TreeImplementation.hpp \
+	engine.cpp \
+	engine.hpp \
+	events.hpp \
+	events/AddNodeEvent.cpp \
+	events/AddNodeEvent.hpp \
+	events/AddPortEvent.cpp \
+	events/AddPortEvent.hpp \
 	events/AllNotesOffEvent.cpp \
-	events/ConnectionEvent.h \
+	events/AllNotesOffEvent.hpp \
+	events/ClearPatchEvent.cpp \
+	events/ClearPatchEvent.hpp \
 	events/ConnectionEvent.cpp \
-	events/DisconnectionEvent.h \
-	events/DisconnectionEvent.cpp \
-	events/DisconnectNodeEvent.h \
+	events/ConnectionEvent.hpp \
+	events/CreatePatchEvent.cpp \
+	events/CreatePatchEvent.hpp \
+	events/DeactivateEvent.cpp \
+	events/DeactivateEvent.hpp \
+	events/DestroyEvent.cpp \
+	events/DestroyEvent.hpp \
+	events/DisablePatchEvent.cpp \
+	events/DisablePatchEvent.hpp \
 	events/DisconnectNodeEvent.cpp \
-	events/DisconnectPortEvent.h \
+	events/DisconnectNodeEvent.hpp \
 	events/DisconnectPortEvent.cpp \
-	events/DestroyEvent.h \
-	events/DestroyEvent.cpp \
-	events/AddPortEvent.h \
-	events/AddPortEvent.cpp \
-	events/AddNodeEvent.h \
-	events/AddNodeEvent.cpp \
-	events/SetMetadataEvent.h \
-	events/SetMetadataEvent.cpp \
-	events/RequestMetadataEvent.h \
+	events/DisconnectPortEvent.hpp \
+	events/DisconnectionEvent.cpp \
+	events/DisconnectionEvent.hpp \
+	events/EnablePatchEvent.cpp \
+	events/EnablePatchEvent.hpp \
+	events/LoadPluginsEvent.cpp \
+	events/LoadPluginsEvent.hpp \
+	events/MidiLearnEvent.cpp \
+	events/MidiLearnEvent.hpp \
+	events/NoteOffEvent.cpp \
+	events/NoteOffEvent.hpp \
+	events/NoteOnEvent.cpp \
+	events/NoteOnEvent.hpp \
+	events/PingQueuedEvent.hpp \
+	events/RegisterClientEvent.cpp \
+	events/RegisterClientEvent.hpp \
+	events/RenameEvent.cpp \
+	events/RenameEvent.hpp \
+	events/RequestAllObjectsEvent.cpp \
+	events/RequestAllObjectsEvent.hpp \
 	events/RequestMetadataEvent.cpp \
-	events/RequestPluginEvent.h \
-	events/RequestPluginEvent.cpp \
-	events/RequestObjectEvent.h \
+	events/RequestMetadataEvent.hpp \
 	events/RequestObjectEvent.cpp \
-	events/RequestPortValueEvent.h \
-	events/RequestPortValueEvent.cpp \
-	events/RequestAllObjectsEvent.h \
-	events/RequestAllObjectsEvent.cpp \
-	events/RequestPluginsEvent.h \
+	events/RequestObjectEvent.hpp \
+	events/RequestPluginEvent.cpp \
+	events/RequestPluginEvent.hpp \
 	events/RequestPluginsEvent.cpp \
-	events/CreatePatchEvent.h \
-	events/CreatePatchEvent.cpp \
-	events/LoadPluginsEvent.h \
-	events/LoadPluginsEvent.cpp \
-	events/EnablePatchEvent.h \
-	events/EnablePatchEvent.cpp \
-	events/DisablePatchEvent.h \
-	events/DisablePatchEvent.cpp \
-	events/ClearPatchEvent.h \
-	events/ClearPatchEvent.cpp \
-	events/RenameEvent.h \
-	events/RenameEvent.cpp \
-	events/MidiLearnEvent.h \
-	events/MidiLearnEvent.cpp \
-	types.h
-# 	BridgeNode.h 
-# 	BridgeNode.cpp 
-# 	ControlInputNode.h 
-# 	ControlInputNode.cpp 
-# 	ControlOutputNode.h 
-# 	ControlOutputNode.cpp 
-# 	AudioInputNode.h 
-# 	AudioInputNode.cpp 
-# 	AudioOutputNode.h 
-# 	AudioOutputNode.cpp 
-# 	MidiInputNode.h 
-# 	MidiInputNode.cpp 
-# 	MidiOutputNode.h 
-# 	MidiOutputNode.cpp 
+	events/RequestPluginsEvent.hpp \
+	events/RequestPortValueEvent.cpp \
+	events/RequestPortValueEvent.hpp \
+	events/SetMetadataEvent.cpp \
+	events/SetMetadataEvent.hpp \
+	events/SetPortValueEvent.cpp \
+	events/SetPortValueEvent.hpp \
+	events/SetPortValueQueuedEvent.cpp \
+	events/SetPortValueQueuedEvent.hpp \
+	events/UnregisterClientEvent.cpp \
+	events/UnregisterClientEvent.hpp \
+	instantiations.cpp \
+	jack_compat.hpp \
+	tuning.hpp \
+	types.hpp \
+	util.hpp
 
 if WITH_LADSPA
 libingen_engine_la_SOURCES += \
-	LADSPANode.h \
+	LADSPANode.hpp \
 	LADSPANode.cpp
 endif
 
 if WITH_DSSI
 libingen_engine_la_SOURCES += \
-	DSSINode.h \
+	DSSINode.hpp \
 	DSSINode.cpp \
 	events/DSSIConfigureEvent.cpp \
-	events/DSSIConfigureEvent.h \
+	events/DSSIConfigureEvent.hpp \
 	events/DSSIControlEvent.cpp \
-	events/DSSIControlEvent.h \
+	events/DSSIControlEvent.hpp \
 	events/DSSIProgramEvent.cpp \
-	events/DSSIProgramEvent.h \
+	events/DSSIProgramEvent.hpp \
 	events/DSSIUpdateEvent.cpp \
-	events/DSSIUpdateEvent.h
+	events/DSSIUpdateEvent.hpp
 endif
 
 if WITH_LV2
 libingen_engine_la_SOURCES += \
-	LV2Node.h \
+	LV2Node.hpp \
 	LV2Node.cpp
 endif
 
 #if WITH_LASH
 #libingen_engine_la_SOURCES += \
-#	LashDriver.h \
+#	LashDriver.hpp \
 #	LashDriver.cpp
 #endif
 
diff --git a/src/libs/engine/MidiBuffer.cpp b/src/libs/engine/MidiBuffer.cpp
index 41feb3df..f2741dfb 100644
--- a/src/libs/engine/MidiBuffer.cpp
+++ b/src/libs/engine/MidiBuffer.cpp
@@ -16,7 +16,7 @@
  */
 
 #include <iostream>
-#include "MidiBuffer.h"
+#include "MidiBuffer.hpp"
 
 using namespace std;
 
diff --git a/src/libs/engine/MidiBuffer.h b/src/libs/engine/MidiBuffer.hpp
index 54a245df..bf1eacac 100644
--- a/src/libs/engine/MidiBuffer.h
+++ b/src/libs/engine/MidiBuffer.hpp
@@ -19,8 +19,8 @@
 #define MIDIBUFFER_H
 
 #include <lv2ext/lv2-midifunctions.h>
-#include "Buffer.h"
-#include "DataType.h"
+#include "Buffer.hpp"
+#include "DataType.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/MidiControlNode.cpp b/src/libs/engine/MidiControlNode.cpp
index dcd32768..01b17743 100644
--- a/src/libs/engine/MidiControlNode.cpp
+++ b/src/libs/engine/MidiControlNode.cpp
@@ -15,16 +15,16 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "MidiControlNode.h"
+#include "MidiControlNode.hpp"
 #include <math.h>
 #include <raul/midi_events.h>
-#include "PostProcessor.h"
-#include "MidiLearnEvent.h"
-#include "InputPort.h"
-#include "OutputPort.h"
-#include "Plugin.h"
-#include "util.h"
-#include "AudioBuffer.h"
+#include "PostProcessor.hpp"
+#include "MidiLearnEvent.hpp"
+#include "InputPort.hpp"
+#include "OutputPort.hpp"
+#include "Plugin.hpp"
+#include "util.hpp"
+#include "AudioBuffer.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/MidiControlNode.h b/src/libs/engine/MidiControlNode.hpp
index 41d02dfb..2065b3c3 100644
--- a/src/libs/engine/MidiControlNode.h
+++ b/src/libs/engine/MidiControlNode.hpp
@@ -19,9 +19,9 @@
 #define MIDICONTROLNODE_H
 
 #include <string>
-#include "NodeBase.h"
-#include "InternalNode.h"
-#include "MidiBuffer.h"
+#include "NodeBase.hpp"
+#include "InternalNode.hpp"
+#include "MidiBuffer.hpp"
 
 namespace Ingen {
 	
diff --git a/src/libs/engine/MidiDriver.h b/src/libs/engine/MidiDriver.hpp
index ebee458c..acf88a3e 100644
--- a/src/libs/engine/MidiDriver.h
+++ b/src/libs/engine/MidiDriver.hpp
@@ -18,10 +18,10 @@
 #ifndef MIDIDRIVER_H
 #define MIDIDRIVER_H
 
-#include "types.h"
-#include "Driver.h"
+#include "types.hpp"
+#include "Driver.hpp"
 #include <iostream>
-#include "MidiBuffer.h"
+#include "MidiBuffer.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/MidiNoteNode.cpp b/src/libs/engine/MidiNoteNode.cpp
index 2eec62a4..37f34202 100644
--- a/src/libs/engine/MidiNoteNode.cpp
+++ b/src/libs/engine/MidiNoteNode.cpp
@@ -15,18 +15,18 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "MidiNoteNode.h"
+#include "MidiNoteNode.hpp"
 #include <cmath>
 #include <iostream>
-#include <raul/Array.h>
+#include <raul/Array.hpp>
 #include <raul/midi_events.h>
-#include "MidiBuffer.h"
-#include "AudioBuffer.h"
-#include "InputPort.h"
-#include "OutputPort.h"
-#include "Plugin.h"
-#include "AudioDriver.h"
-#include "util.h"
+#include "MidiBuffer.hpp"
+#include "AudioBuffer.hpp"
+#include "InputPort.hpp"
+#include "OutputPort.hpp"
+#include "Plugin.hpp"
+#include "AudioDriver.hpp"
+#include "util.hpp"
 
 using std::cerr; using std::cout; using std::endl;
 
diff --git a/src/libs/engine/MidiNoteNode.h b/src/libs/engine/MidiNoteNode.hpp
index 5be62995..88421ecb 100644
--- a/src/libs/engine/MidiNoteNode.h
+++ b/src/libs/engine/MidiNoteNode.hpp
@@ -19,9 +19,9 @@
 #define MIDINOTENODE_H
 
 #include <string>
-#include "InternalNode.h"
-#include "types.h"
-#include "MidiBuffer.h"
+#include "InternalNode.hpp"
+#include "types.hpp"
+#include "MidiBuffer.hpp"
 
 using std::string;
 
diff --git a/src/libs/engine/MidiTriggerNode.cpp b/src/libs/engine/MidiTriggerNode.cpp
index 610f3ef9..e397033f 100644
--- a/src/libs/engine/MidiTriggerNode.cpp
+++ b/src/libs/engine/MidiTriggerNode.cpp
@@ -17,12 +17,12 @@
 
 #include <cmath>
 #include <raul/midi_events.h>
-#include "MidiTriggerNode.h"
-#include "AudioBuffer.h"
-#include "InputPort.h"
-#include "OutputPort.h"
-#include "Plugin.h"
-#include "util.h"
+#include "MidiTriggerNode.hpp"
+#include "AudioBuffer.hpp"
+#include "InputPort.hpp"
+#include "OutputPort.hpp"
+#include "Plugin.hpp"
+#include "util.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/MidiTriggerNode.h b/src/libs/engine/MidiTriggerNode.hpp
index f46e6dee..6c2dadfa 100644
--- a/src/libs/engine/MidiTriggerNode.h
+++ b/src/libs/engine/MidiTriggerNode.hpp
@@ -19,8 +19,8 @@
 #define MIDITRIGGERNODE_H
 
 #include <string>
-#include "InternalNode.h"
-#include "MidiBuffer.h"
+#include "InternalNode.hpp"
+#include "MidiBuffer.hpp"
 
 using std::string;
 
diff --git a/src/libs/engine/Node.h b/src/libs/engine/Node.hpp
index 93f032a8..35edd201 100644
--- a/src/libs/engine/Node.h
+++ b/src/libs/engine/Node.hpp
@@ -19,12 +19,9 @@
 #define NODE_H
 
 #include <string>
-#include <raul/Array.h>
-#include "types.h"
-#include "GraphObject.h"
-
-
-using std::string;
+#include <raul/Array.hpp>
+#include "types.hpp"
+#include "GraphObject.hpp"
 
 namespace Raul { template <typename T> class List; }
 
@@ -52,7 +49,7 @@ namespace Shared { class ClientInterface; }
 class Node : public GraphObject
 {
 public:
-	Node(GraphObject* parent, const string& name) : GraphObject(parent, name) {}
+	Node(GraphObject* parent, const std::string& name) : GraphObject(parent, name) {}
 	virtual ~Node() {}
 
 	/** Activate this Node.
diff --git a/src/libs/engine/NodeBase.cpp b/src/libs/engine/NodeBase.cpp
index ffd509c4..04afe3b6 100644
--- a/src/libs/engine/NodeBase.cpp
+++ b/src/libs/engine/NodeBase.cpp
@@ -15,18 +15,18 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "NodeBase.h"
+#include "NodeBase.hpp"
 #include <cassert>
 #include <iostream>
 #include <stdint.h>
-#include <raul/List.h>
-#include <raul/Array.h>
-#include "util.h"
-#include "Plugin.h"
-#include "ClientBroadcaster.h"
-#include "Port.h"
-#include "Patch.h"
-#include "ObjectStore.h"
+#include <raul/List.hpp>
+#include <raul/Array.hpp>
+#include "util.hpp"
+#include "Plugin.hpp"
+#include "ClientBroadcaster.hpp"
+#include "Port.hpp"
+#include "Patch.hpp"
+#include "ObjectStore.hpp"
 
 using std::cout; using std::cerr; using std::endl;
 
diff --git a/src/libs/engine/NodeBase.h b/src/libs/engine/NodeBase.hpp
index a1372f19..46c004df 100644
--- a/src/libs/engine/NodeBase.h
+++ b/src/libs/engine/NodeBase.hpp
@@ -18,10 +18,10 @@
 #ifndef NODEBASE_H
 #define NODEBASE_H
 
-#include "types.h"
+#include "types.hpp"
 #include <string>
 #include <cstdlib>
-#include "Node.h"
+#include "Node.hpp"
 
 using std::string;
 
diff --git a/src/libs/engine/NodeFactory.cpp b/src/libs/engine/NodeFactory.cpp
index 4e91ed02..24221dd7 100644
--- a/src/libs/engine/NodeFactory.cpp
+++ b/src/libs/engine/NodeFactory.cpp
@@ -15,30 +15,30 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "NodeFactory.h"
-#include "config.h"
+#include "NodeFactory.hpp"
+#include "../../../../config/config.h"
 #include <cstdlib>
 #include <pthread.h>
 #include <dirent.h>
 #include <float.h>
 #include <cmath>
-#include "ThreadManager.h"
-#include "MidiNoteNode.h"
-#include "MidiTriggerNode.h"
-#include "MidiControlNode.h"
-#include "TransportNode.h"
-#include "Plugin.h"
-#include "Patch.h"
+#include "ThreadManager.hpp"
+#include "MidiNoteNode.hpp"
+#include "MidiTriggerNode.hpp"
+#include "MidiControlNode.hpp"
+#include "TransportNode.hpp"
+#include "Plugin.hpp"
+#include "Patch.hpp"
 #ifdef HAVE_SLV2
-#include "LV2Node.h"
+#include "LV2Node.hpp"
 #include <slv2/slv2.h>
 #include <slv2/util.h> // old slv2 compat
 #endif
 #ifdef HAVE_LADSPA
-#include "LADSPANode.h"
+#include "LADSPANode.hpp"
 #endif
 #ifdef HAVE_DSSI
-#include "DSSINode.h"
+#include "DSSINode.hpp"
 #endif
 
 using std::string;
diff --git a/src/libs/engine/NodeFactory.h b/src/libs/engine/NodeFactory.hpp
index bc41de23..3b8eb711 100644
--- a/src/libs/engine/NodeFactory.h
+++ b/src/libs/engine/NodeFactory.hpp
@@ -15,12 +15,11 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-
 #ifndef NODEFACTORY_H
 #define NODEFACTORY_H
 
-#include "config.h"
-#include "types.h"
+#include "../../../../config/config.h"
+
 #include <list>
 #include <string>
 #include <ladspa.h>
@@ -29,6 +28,7 @@
 #ifdef HAVE_SLV2
 #include <slv2/slv2.h>
 #endif
+#include "types.hpp"
 
 using std::string; using std::list;
 
diff --git a/src/libs/engine/OSCBuffer.cpp b/src/libs/engine/OSCBuffer.cpp
index ff23a281..b4452c13 100644
--- a/src/libs/engine/OSCBuffer.cpp
+++ b/src/libs/engine/OSCBuffer.cpp
@@ -16,7 +16,7 @@
  */
 
 #include <iostream>
-#include "OSCBuffer.h"
+#include "OSCBuffer.hpp"
 
 using namespace std;
 
diff --git a/src/libs/engine/OSCBuffer.h b/src/libs/engine/OSCBuffer.hpp
index 53e3b2d5..1e7e048a 100644
--- a/src/libs/engine/OSCBuffer.h
+++ b/src/libs/engine/OSCBuffer.hpp
@@ -18,8 +18,8 @@
 #ifndef OSCBUFFER_H
 #define OSCBUFFER_H
 
-#include "Buffer.h"
-#include "DataType.h"
+#include "Buffer.hpp"
+#include "DataType.hpp"
 #include "../../../../lv2/extensions/osc/lv2_osc.h"
 
 namespace Ingen {
diff --git a/src/libs/engine/OSCClientSender.cpp b/src/libs/engine/OSCClientSender.cpp
index c3f0f330..23144978 100644
--- a/src/libs/engine/OSCClientSender.cpp
+++ b/src/libs/engine/OSCClientSender.cpp
@@ -15,22 +15,22 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "OSCClientSender.h"
+#include "OSCClientSender.hpp"
 #include <cassert>
 #include <iostream>
 #include <unistd.h>
-#include <raul/AtomLiblo.h>
-#include "ObjectStore.h"
-#include "NodeFactory.h"
-#include "util.h"
-#include "Patch.h"
-#include "Node.h"
-#include "Plugin.h"
-#include "Port.h"
-#include "Connection.h"
-#include "AudioDriver.h"
-#include "interface/ClientInterface.h"
-#include "interface/Responder.h"
+#include <raul/AtomLiblo.hpp>
+#include "ObjectStore.hpp"
+#include "NodeFactory.hpp"
+#include "util.hpp"
+#include "Patch.hpp"
+#include "Node.hpp"
+#include "Plugin.hpp"
+#include "Port.hpp"
+#include "Connection.hpp"
+#include "AudioDriver.hpp"
+#include "interface/ClientInterface.hpp"
+#include "interface/Responder.hpp"
 using std::cout; using std::cerr; using std::endl;
 
 namespace Ingen {
diff --git a/src/libs/engine/OSCClientSender.h b/src/libs/engine/OSCClientSender.hpp
index 7def53ba..769bb0b9 100644
--- a/src/libs/engine/OSCClientSender.h
+++ b/src/libs/engine/OSCClientSender.hpp
@@ -24,8 +24,8 @@
 #include <list>
 #include <lo/lo.h>
 #include <pthread.h>
-#include "types.h"
-#include "interface/ClientInterface.h"
+#include "types.hpp"
+#include "interface/ClientInterface.hpp"
 
 using std::list; using std::string;
 using std::cerr;
diff --git a/src/libs/engine/OSCDriver.h b/src/libs/engine/OSCDriver.hpp
index 08294783..a8e5402d 100644
--- a/src/libs/engine/OSCDriver.h
+++ b/src/libs/engine/OSCDriver.hpp
@@ -18,10 +18,10 @@
 #ifndef OSCDRIVER_H
 #define OSCDRIVER_H
 
-#include "types.h"
-#include "Driver.h"
+#include "types.hpp"
+#include "Driver.hpp"
 #include <iostream>
-#include "OSCBuffer.h"
+#include "OSCBuffer.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/OSCEngineReceiver.cpp b/src/libs/engine/OSCEngineReceiver.cpp
index 7bc336c2..d3d1b666 100644
--- a/src/libs/engine/OSCEngineReceiver.cpp
+++ b/src/libs/engine/OSCEngineReceiver.cpp
@@ -19,16 +19,16 @@
 #include <cstdlib>
 #include <string>
 #include <lo/lo.h>
-#include "types.h"
-#include <raul/SharedPtr.h>
-#include <raul/AtomLiblo.h>
-#include "interface/ClientKey.h"
-#include "interface/ClientInterface.h"
-#include "OSCEngineReceiver.h"
-#include "QueuedEventSource.h"
-#include "OSCClientSender.h"
-#include "OSCResponder.h"
-#include "ClientBroadcaster.h"
+#include "types.hpp"
+#include <raul/SharedPtr.hpp>
+#include <raul/AtomLiblo.hpp>
+#include "interface/ClientKey.hpp"
+#include "interface/ClientInterface.hpp"
+#include "OSCEngineReceiver.hpp"
+#include "QueuedEventSource.hpp"
+#include "OSCClientSender.hpp"
+#include "OSCResponder.hpp"
+#include "ClientBroadcaster.hpp"
 
 using std::cerr; using std::cout; using std::endl;
 
diff --git a/src/libs/engine/OSCEngineReceiver.h b/src/libs/engine/OSCEngineReceiver.hpp
index ba9d2544..40a3801b 100644
--- a/src/libs/engine/OSCEngineReceiver.h
+++ b/src/libs/engine/OSCEngineReceiver.hpp
@@ -18,13 +18,13 @@
 #ifndef OSCENGINERECEIVER_H
 #define OSCENGINERECEIVER_H
 
-#include "config.h"
+#include "../../../../config/config.h"
 #include <string>
 #include <stdint.h>
 #include <lo/lo.h>
-#include <raul/SharedPtr.h>
-#include "QueuedEngineInterface.h"
-#include "OSCResponder.h"
+#include <raul/SharedPtr.hpp>
+#include "QueuedEngineInterface.hpp"
+#include "OSCResponder.hpp"
 using std::string;
 
 namespace Ingen {
diff --git a/src/libs/engine/OSCResponder.cpp b/src/libs/engine/OSCResponder.cpp
index dcec4641..71104be4 100644
--- a/src/libs/engine/OSCResponder.cpp
+++ b/src/libs/engine/OSCResponder.cpp
@@ -15,9 +15,9 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "OSCResponder.h"
-#include "ClientBroadcaster.h"
-#include "interface/ClientKey.h"
+#include "OSCResponder.hpp"
+#include "ClientBroadcaster.hpp"
+#include "interface/ClientKey.hpp"
 #include <cstdlib>
 #include <iostream>
 #include <inttypes.h>
diff --git a/src/libs/engine/OSCResponder.h b/src/libs/engine/OSCResponder.hpp
index 41158c14..a7b0968d 100644
--- a/src/libs/engine/OSCResponder.h
+++ b/src/libs/engine/OSCResponder.hpp
@@ -21,7 +21,7 @@
 #include <inttypes.h>
 #include <memory>
 #include <lo/lo.h>
-#include "interface/Responder.h"
+#include "interface/Responder.hpp"
 
 namespace Ingen {
 
@@ -47,7 +47,7 @@ public:
 	void set_id(int32_t id) { _id = id; }
 
 	void respond_ok();
-	void respond_error(const string& msg);
+	void respond_error(const std::string& msg);
 
 	const char* url() const { return _url; }
 
diff --git a/src/libs/engine/ObjectSender.cpp b/src/libs/engine/ObjectSender.cpp
index 592f4735..216adf86 100644
--- a/src/libs/engine/ObjectSender.cpp
+++ b/src/libs/engine/ObjectSender.cpp
@@ -15,17 +15,17 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "ObjectSender.h"
-#include "interface/ClientInterface.h"
-#include "ObjectStore.h"
-#include "Patch.h"
-#include "Node.h"
-#include "Port.h"
-#include "Port.h"
-#include "Connection.h"
-#include "NodeFactory.h"
-#include "DataType.h"
-#include "AudioBuffer.h"
+#include "ObjectSender.hpp"
+#include "interface/ClientInterface.hpp"
+#include "ObjectStore.hpp"
+#include "Patch.hpp"
+#include "Node.hpp"
+#include "Port.hpp"
+#include "Port.hpp"
+#include "Connection.hpp"
+#include "NodeFactory.hpp"
+#include "DataType.hpp"
+#include "AudioBuffer.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/ObjectSender.h b/src/libs/engine/ObjectSender.hpp
index 51ecb34c..51ecb34c 100644
--- a/src/libs/engine/ObjectSender.h
+++ b/src/libs/engine/ObjectSender.hpp
diff --git a/src/libs/engine/ObjectStore.cpp b/src/libs/engine/ObjectStore.cpp
index 709e3823..293adbef 100644
--- a/src/libs/engine/ObjectStore.cpp
+++ b/src/libs/engine/ObjectStore.cpp
@@ -15,13 +15,13 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <raul/List.h>
-#include <raul/Path.h>
-#include "ObjectStore.h"
-#include "Patch.h"
-#include "Node.h"
-#include "Port.h"
-#include "Tree.h"
+#include <raul/List.hpp>
+#include <raul/Path.hpp>
+#include "ObjectStore.hpp"
+#include "Patch.hpp"
+#include "Node.hpp"
+#include "Port.hpp"
+#include "Tree.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/ObjectStore.h b/src/libs/engine/ObjectStore.hpp
index 4c0a621a..8a5b61c6 100644
--- a/src/libs/engine/ObjectStore.h
+++ b/src/libs/engine/ObjectStore.hpp
@@ -15,13 +15,12 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-
 #ifndef OBJECTSTORE_H
 #define OBJECTSTORE_H
 
 #include <string>
-#include <raul/Path.h>
-#include "Tree.h"
+#include <raul/Path.hpp>
+#include "Tree.hpp"
 
 using std::string;
 using Raul::Path;
diff --git a/src/libs/engine/OmInProcess.cpp b/src/libs/engine/OmInProcess.cpp
index 6893ebe2..cf821441 100644
--- a/src/libs/engine/OmInProcess.cpp
+++ b/src/libs/engine/OmInProcess.cpp
@@ -19,11 +19,11 @@
 #include <stdio.h>
 #include <memory.h>
 #include <jack/jack.h>
-#include "Engine.h"
-#include "OSCReceiver.h"
-#include "JackAudioDriver.h"
+#include "Engine.hpp"
+#include "OSCReceiver.hpp"
+#include "JackAudioDriver.hpp"
 /*#ifdef HAVE_LASH
-#include "LashDriver.h"
+#include "LashDriver.hpp"
 #endif*/
 
 extern "C"
diff --git a/src/libs/engine/OutputPort.cpp b/src/libs/engine/OutputPort.cpp
index ea723963..0e688818 100644
--- a/src/libs/engine/OutputPort.cpp
+++ b/src/libs/engine/OutputPort.cpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "OutputPort.h"
-#include "Buffer.h"
+#include "OutputPort.hpp"
+#include "Buffer.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/OutputPort.h b/src/libs/engine/OutputPort.hpp
index 0e94be9f..dbeb30a9 100644
--- a/src/libs/engine/OutputPort.h
+++ b/src/libs/engine/OutputPort.hpp
@@ -20,8 +20,8 @@
 
 #include <string>
 #include <cstdlib>
-#include "Port.h"
-#include "types.h"
+#include "Port.hpp"
+#include "types.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/Patch.cpp b/src/libs/engine/Patch.cpp
index dad3431b..16d2365f 100644
--- a/src/libs/engine/Patch.cpp
+++ b/src/libs/engine/Patch.cpp
@@ -18,13 +18,13 @@
 #include <cassert>
 #include <cmath>
 #include <iostream>
-#include "ThreadManager.h"
-#include "Node.h"
-#include "Patch.h"
-#include "Plugin.h"
-#include "Port.h"
-#include "Connection.h"
-#include "DuplexPort.h"
+#include "ThreadManager.hpp"
+#include "Node.hpp"
+#include "Patch.hpp"
+#include "Plugin.hpp"
+#include "Port.hpp"
+#include "Connection.hpp"
+#include "DuplexPort.hpp"
 
 using std::cerr; using std::cout; using std::endl;
 
diff --git a/src/libs/engine/Patch.h b/src/libs/engine/Patch.hpp
index ba74d1af..7422f551 100644
--- a/src/libs/engine/Patch.h
+++ b/src/libs/engine/Patch.hpp
@@ -20,10 +20,10 @@
 
 #include <cstdlib>
 #include <string>
-#include <raul/List.h>
-#include "NodeBase.h"
-#include "Plugin.h"
-#include "DataType.h"
+#include <raul/List.hpp>
+#include "NodeBase.hpp"
+#include "Plugin.hpp"
+#include "DataType.hpp"
 
 using std::string;
 
diff --git a/src/libs/engine/Plugin.cpp b/src/libs/engine/Plugin.cpp
index afd0f43a..a0f423e0 100644
--- a/src/libs/engine/Plugin.cpp
+++ b/src/libs/engine/Plugin.cpp
@@ -15,11 +15,11 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "Plugin.h"
-#include "MidiNoteNode.h"
-#include "MidiTriggerNode.h"
-#include "MidiControlNode.h"
-#include "TransportNode.h"
+#include "Plugin.hpp"
+#include "MidiNoteNode.hpp"
+#include "MidiTriggerNode.hpp"
+#include "MidiControlNode.hpp"
+#include "TransportNode.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/Plugin.h b/src/libs/engine/Plugin.hpp
index 1a43e6fc..10689145 100644
--- a/src/libs/engine/Plugin.h
+++ b/src/libs/engine/Plugin.hpp
@@ -18,7 +18,7 @@
 #ifndef PLUGIN_H
 #define PLUGIN_H
 
-#include "config.h"
+#include "../../../../config/config.h"
 
 #include <cstdlib>
 #include <glibmm/module.h>
@@ -29,7 +29,7 @@
 #ifdef HAVE_SLV2
 #include <slv2/slv2.h>
 #endif
-#include "types.h"
+#include "types.hpp"
 using std::string;
 using std::cerr; using std::endl;
 
diff --git a/src/libs/engine/Port.cpp b/src/libs/engine/Port.cpp
index f82da743..873e4c85 100644
--- a/src/libs/engine/Port.cpp
+++ b/src/libs/engine/Port.cpp
@@ -15,11 +15,11 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "Port.h"
-#include "Node.h"
-#include "DataType.h"
-#include "Buffer.h"
-#include "BufferFactory.h"
+#include "Port.hpp"
+#include "Node.hpp"
+#include "DataType.hpp"
+#include "Buffer.hpp"
+#include "BufferFactory.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/Port.h b/src/libs/engine/Port.hpp
index 6b3c20e8..2414e86d 100644
--- a/src/libs/engine/Port.h
+++ b/src/libs/engine/Port.hpp
@@ -20,12 +20,10 @@
 
 #include <cstdlib>
 #include <string>
-#include <raul/Array.h>
-#include "types.h"
-#include "GraphObject.h"
-#include "DataType.h"
-
-using std::string;
+#include <raul/Array.hpp>
+#include "types.hpp"
+#include "GraphObject.hpp"
+#include "DataType.hpp"
 
 namespace Ingen {
 
@@ -73,7 +71,7 @@ public:
 	bool fixed_buffers()       { return _fixed_buffers; }
 
 protected:
-	Port(Node* const node, const string& name, size_t index, size_t poly, DataType type, size_t buffer_size);
+	Port(Node* const node, const std::string& name, size_t index, size_t poly, DataType type, size_t buffer_size);
 	
 	virtual void allocate_buffers();
 	virtual void connect_buffers();
diff --git a/src/libs/engine/PostProcessor.cpp b/src/libs/engine/PostProcessor.cpp
index 7f74ee82..64c106d8 100644
--- a/src/libs/engine/PostProcessor.cpp
+++ b/src/libs/engine/PostProcessor.cpp
@@ -18,10 +18,10 @@
 #include <cassert>
 #include <iostream>
 #include <pthread.h>
-#include <raul/SRSWQueue.h>
-#include <raul/Maid.h>
-#include "Event.h"
-#include "PostProcessor.h"
+#include <raul/SRSWQueue.hpp>
+#include <raul/Maid.hpp>
+#include "Event.hpp"
+#include "PostProcessor.hpp"
 
 using std::cerr; using std::cout; using std::endl;
 
diff --git a/src/libs/engine/PostProcessor.h b/src/libs/engine/PostProcessor.hpp
index 4e3d91a1..b77bda6e 100644
--- a/src/libs/engine/PostProcessor.h
+++ b/src/libs/engine/PostProcessor.hpp
@@ -19,9 +19,9 @@
 #define POSTPROCESSOR_H
 
 #include <pthread.h>
-#include "types.h"
-#include <raul/SRSWQueue.h>
-#include <raul/Slave.h>
+#include "types.hpp"
+#include <raul/SRSWQueue.hpp>
+#include <raul/Slave.hpp>
 
 namespace Raul { class Maid; }
 
diff --git a/src/libs/engine/QueuedEngineInterface.cpp b/src/libs/engine/QueuedEngineInterface.cpp
index 4641f108..2abb5a1c 100644
--- a/src/libs/engine/QueuedEngineInterface.cpp
+++ b/src/libs/engine/QueuedEngineInterface.cpp
@@ -15,12 +15,12 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "QueuedEngineInterface.h"
-#include "config.h"
-#include "QueuedEventSource.h"
-#include "events.h"
-#include "Engine.h"
-#include "AudioDriver.h"
+#include "QueuedEngineInterface.hpp"
+#include "../../../../config/config.h"
+#include "QueuedEventSource.hpp"
+#include "events.hpp"
+#include "Engine.hpp"
+#include "AudioDriver.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/QueuedEngineInterface.h b/src/libs/engine/QueuedEngineInterface.hpp
index 0d2ba5d9..204338bf 100644
--- a/src/libs/engine/QueuedEngineInterface.h
+++ b/src/libs/engine/QueuedEngineInterface.hpp
@@ -21,13 +21,13 @@
 #include <inttypes.h>
 #include <string>
 #include <memory>
-#include <raul/SharedPtr.h>
-#include "interface/EngineInterface.h"
-#include "interface/ClientInterface.h"
-#include "interface/ClientKey.h"
-#include "interface/Responder.h"
-#include "QueuedEventSource.h"
-#include "Engine.h"
+#include <raul/SharedPtr.hpp>
+#include "interface/EngineInterface.hpp"
+#include "interface/ClientInterface.hpp"
+#include "interface/ClientKey.hpp"
+#include "interface/Responder.hpp"
+#include "QueuedEventSource.hpp"
+#include "Engine.hpp"
 using std::string;
 
 namespace Ingen {
diff --git a/src/libs/engine/QueuedEvent.h b/src/libs/engine/QueuedEvent.hpp
index f1b82735..4afe509d 100644
--- a/src/libs/engine/QueuedEvent.h
+++ b/src/libs/engine/QueuedEvent.hpp
@@ -18,7 +18,7 @@
 #ifndef QUEUEDEVENT_H
 #define QUEUEDEVENT_H
 
-#include "Event.h"
+#include "Event.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/QueuedEventSource.cpp b/src/libs/engine/QueuedEventSource.cpp
index 830b0103..6414a6e9 100644
--- a/src/libs/engine/QueuedEventSource.cpp
+++ b/src/libs/engine/QueuedEventSource.cpp
@@ -15,10 +15,10 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "QueuedEventSource.h"
-#include "QueuedEvent.h"
-#include "PostProcessor.h"
-#include "ThreadManager.h"
+#include "QueuedEventSource.hpp"
+#include "QueuedEvent.hpp"
+#include "PostProcessor.hpp"
+#include "ThreadManager.hpp"
 #include <sys/mman.h>
 #include <iostream>
 using std::cout; using std::cerr; using std::endl;
diff --git a/src/libs/engine/QueuedEventSource.h b/src/libs/engine/QueuedEventSource.hpp
index d0c17c0b..df1a4824 100644
--- a/src/libs/engine/QueuedEventSource.h
+++ b/src/libs/engine/QueuedEventSource.hpp
@@ -20,12 +20,12 @@
 
 #include <cstdlib>
 #include <pthread.h>
-#include "types.h"
-#include <raul/Semaphore.h>
-#include <raul/SRSWQueue.h>
-#include <raul/Slave.h>
-#include "Event.h"
-#include "EventSource.h"
+#include "types.hpp"
+#include <raul/Semaphore.hpp>
+#include <raul/SRSWQueue.hpp>
+#include <raul/Slave.hpp>
+#include "Event.hpp"
+#include "EventSource.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/ThreadManager.h b/src/libs/engine/ThreadManager.hpp
index dc415526..12f27000 100644
--- a/src/libs/engine/ThreadManager.h
+++ b/src/libs/engine/ThreadManager.hpp
@@ -18,7 +18,7 @@
 #ifndef THREADMANAGER_H
 #define THREADMANAGER_H
 
-#include <raul/Thread.h>
+#include <raul/Thread.hpp>
 
 using Raul::Thread;
 
diff --git a/src/libs/engine/TransportNode.cpp b/src/libs/engine/TransportNode.cpp
index d8895d72..5b4c6b05 100644
--- a/src/libs/engine/TransportNode.cpp
+++ b/src/libs/engine/TransportNode.cpp
@@ -15,14 +15,14 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "TransportNode.h"
+#include "TransportNode.hpp"
 #include <jack/transport.h>
-#include "OutputPort.h"
-#include "Plugin.h"
-#include "JackAudioDriver.h"
-#include "Port.h"
-#include "util.h"
-//#include "Engine.h"
+#include "OutputPort.hpp"
+#include "Plugin.hpp"
+#include "JackAudioDriver.hpp"
+#include "Port.hpp"
+#include "util.hpp"
+//#include "Engine.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/TransportNode.h b/src/libs/engine/TransportNode.hpp
index 4dd1c84b..96810223 100644
--- a/src/libs/engine/TransportNode.h
+++ b/src/libs/engine/TransportNode.hpp
@@ -22,7 +22,7 @@
 
 #include <string>
 #include <jack/transport.h>
-#include "InternalNode.h"
+#include "InternalNode.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/Tree.h b/src/libs/engine/Tree.hpp
index cba23776..c6e36926 100644
--- a/src/libs/engine/Tree.h
+++ b/src/libs/engine/Tree.hpp
@@ -21,7 +21,7 @@
 #include <string>
 #include <cassert>
 #include <boost/utility.hpp>
-#include <raul/Deletable.h>
+#include <raul/Deletable.hpp>
 using std::string;
 
 template<typename T> class Tree;
diff --git a/src/libs/engine/TreeImplementation.h b/src/libs/engine/TreeImplementation.hpp
index 418264bc..681079ac 100644
--- a/src/libs/engine/TreeImplementation.h
+++ b/src/libs/engine/TreeImplementation.hpp
@@ -15,7 +15,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "Tree.h"
+#include "Tree.hpp"
 #include <cstdlib>
 #include <iostream>
 #include <cassert>
diff --git a/src/libs/engine/engine.cpp b/src/libs/engine/engine.cpp
index d07efda8..bc272663 100644
--- a/src/libs/engine/engine.cpp
+++ b/src/libs/engine/engine.cpp
@@ -15,12 +15,12 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <raul/Process.h>
-#include "engine.h"
-#include "Engine.h"
-#include "QueuedEngineInterface.h"
-#include "tuning.h"
-#include "util.h"
+#include <raul/Process.hpp>
+#include "engine.hpp"
+#include "Engine.hpp"
+#include "QueuedEngineInterface.hpp"
+#include "tuning.hpp"
+#include "util.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/engine.h b/src/libs/engine/engine.hpp
index 04bf7b1f..940db440 100644
--- a/src/libs/engine/engine.h
+++ b/src/libs/engine/engine.hpp
@@ -18,7 +18,7 @@
 #ifndef INGEN_ENGINE_H
 #define INGEN_ENGINE_H
 
-#include <raul/SharedPtr.h>
+#include <raul/SharedPtr.hpp>
 
 namespace Ingen {
 
diff --git a/src/libs/engine/events.h b/src/libs/engine/events.h
deleted file mode 100644
index 05b1a148..00000000
--- a/src/libs/engine/events.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* This file is part of Ingen.
- * Copyright (C) 2007 Dave Robillard <http://drobilla.net>
- * 
- * Ingen is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- * 
- * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef EVENTS_H
-#define EVENTS_H
-
-#include "config.h"
-
-#include "DeactivateEvent.h"
-#include "EnablePatchEvent.h"
-#include "DisablePatchEvent.h"
-#include "ClearPatchEvent.h"
-#include "SetPortValueEvent.h"
-#include "SetPortValueQueuedEvent.h"
-#include "ConnectionEvent.h"
-#include "DisconnectionEvent.h"
-#include "AddPortEvent.h"
-#include "AddNodeEvent.h"
-#include "CreatePatchEvent.h"
-#include "DestroyEvent.h"
-#include "SetMetadataEvent.h"
-#include "RequestMetadataEvent.h"
-#include "RequestObjectEvent.h"
-#include "RequestPluginEvent.h"
-#include "RequestPortValueEvent.h"
-#include "RequestAllObjectsEvent.h"
-#include "RequestPluginsEvent.h"
-#include "LoadPluginsEvent.h"
-#include "NoteOnEvent.h"
-#include "NoteOffEvent.h"
-#include "AllNotesOffEvent.h"
-#include "DisconnectNodeEvent.h"
-#include "RegisterClientEvent.h"
-#include "UnregisterClientEvent.h"
-#include "RenameEvent.h"
-#include "PingQueuedEvent.h"
-#include "MidiLearnEvent.h"
-
-#ifdef HAVE_DSSI
-#include "DSSIUpdateEvent.h"
-#include "DSSIControlEvent.h"
-#include "DSSIConfigureEvent.h"
-#include "DSSIProgramEvent.h"
-#endif
-
-#endif // EVENTS_H
-
diff --git a/src/libs/engine/events.hpp b/src/libs/engine/events.hpp
new file mode 100644
index 00000000..0cfbbc86
--- /dev/null
+++ b/src/libs/engine/events.hpp
@@ -0,0 +1,61 @@
+/* This file is part of Ingen.
+ * Copyright (C) 2007 Dave Robillard <http://drobilla.net>
+ * 
+ * Ingen is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ * 
+ * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef EVENTS_H
+#define EVENTS_H
+
+#include "../../../../config/config.h"
+
+#include "DeactivateEvent.hpp"
+#include "EnablePatchEvent.hpp"
+#include "DisablePatchEvent.hpp"
+#include "ClearPatchEvent.hpp"
+#include "SetPortValueEvent.hpp"
+#include "SetPortValueQueuedEvent.hpp"
+#include "ConnectionEvent.hpp"
+#include "DisconnectionEvent.hpp"
+#include "AddPortEvent.hpp"
+#include "AddNodeEvent.hpp"
+#include "CreatePatchEvent.hpp"
+#include "DestroyEvent.hpp"
+#include "SetMetadataEvent.hpp"
+#include "RequestMetadataEvent.hpp"
+#include "RequestObjectEvent.hpp"
+#include "RequestPluginEvent.hpp"
+#include "RequestPortValueEvent.hpp"
+#include "RequestAllObjectsEvent.hpp"
+#include "RequestPluginsEvent.hpp"
+#include "LoadPluginsEvent.hpp"
+#include "NoteOnEvent.hpp"
+#include "NoteOffEvent.hpp"
+#include "AllNotesOffEvent.hpp"
+#include "DisconnectNodeEvent.hpp"
+#include "RegisterClientEvent.hpp"
+#include "UnregisterClientEvent.hpp"
+#include "RenameEvent.hpp"
+#include "PingQueuedEvent.hpp"
+#include "MidiLearnEvent.hpp"
+
+#ifdef HAVE_DSSI
+#include "DSSIUpdateEvent.hpp"
+#include "DSSIControlEvent.hpp"
+#include "DSSIConfigureEvent.hpp"
+#include "DSSIProgramEvent.hpp"
+#endif
+
+#endif // EVENTS_H
+
diff --git a/src/libs/engine/events/AddNodeEvent.cpp b/src/libs/engine/events/AddNodeEvent.cpp
index 1ea2b596..fd95e838 100644
--- a/src/libs/engine/events/AddNodeEvent.cpp
+++ b/src/libs/engine/events/AddNodeEvent.cpp
@@ -15,21 +15,21 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "AddNodeEvent.h"
-#include "interface/Responder.h"
-#include "Patch.h"
-#include "Node.h"
-#include "Tree.h"
-#include "Plugin.h"
-#include "Engine.h"
-#include "Patch.h"
-#include "NodeFactory.h"
-#include "ClientBroadcaster.h"
-#include <raul/Maid.h>
-#include <raul/Path.h>
-#include "ObjectStore.h"
-#include <raul/Path.h>
-#include "Port.h"
+#include "AddNodeEvent.hpp"
+#include "interface/Responder.hpp"
+#include "Patch.hpp"
+#include "Node.hpp"
+#include "Tree.hpp"
+#include "Plugin.hpp"
+#include "Engine.hpp"
+#include "Patch.hpp"
+#include "NodeFactory.hpp"
+#include "ClientBroadcaster.hpp"
+#include <raul/Maid.hpp>
+#include <raul/Path.hpp>
+#include "ObjectStore.hpp"
+#include <raul/Path.hpp>
+#include "Port.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/events/AddNodeEvent.h b/src/libs/engine/events/AddNodeEvent.hpp
index 68d518ae..0a64c93a 100644
--- a/src/libs/engine/events/AddNodeEvent.h
+++ b/src/libs/engine/events/AddNodeEvent.hpp
@@ -18,8 +18,8 @@
 #ifndef ADDNODEEVENT_H
 #define ADDNODEEVENT_H
 
-#include "QueuedEvent.h"
-#include <raul/Path.h>
+#include "QueuedEvent.hpp"
+#include <raul/Path.hpp>
 #include <string>
 using std::string;
 
diff --git a/src/libs/engine/events/AddPortEvent.cpp b/src/libs/engine/events/AddPortEvent.cpp
index c2ec9326..c4e7a26c 100644
--- a/src/libs/engine/events/AddPortEvent.cpp
+++ b/src/libs/engine/events/AddPortEvent.cpp
@@ -15,25 +15,25 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <raul/Path.h>
-#include <raul/Array.h>
-#include <raul/List.h>
-#include <raul/Maid.h>
-#include "interface/Responder.h"
-#include "AddPortEvent.h"
-#include "Patch.h"
-#include "Tree.h"
-#include "Plugin.h"
-#include "Engine.h"
-#include "Patch.h"
-#include "QueuedEventSource.h"
-#include "ObjectStore.h"
-#include "ClientBroadcaster.h"
-#include "Port.h"
-#include "AudioDriver.h"
-#include "MidiDriver.h"
-#include "OSCDriver.h"
-#include "DuplexPort.h"
+#include <raul/Path.hpp>
+#include <raul/Array.hpp>
+#include <raul/List.hpp>
+#include <raul/Maid.hpp>
+#include "interface/Responder.hpp"
+#include "AddPortEvent.hpp"
+#include "Patch.hpp"
+#include "Tree.hpp"
+#include "Plugin.hpp"
+#include "Engine.hpp"
+#include "Patch.hpp"
+#include "QueuedEventSource.hpp"
+#include "ObjectStore.hpp"
+#include "ClientBroadcaster.hpp"
+#include "Port.hpp"
+#include "AudioDriver.hpp"
+#include "MidiDriver.hpp"
+#include "OSCDriver.hpp"
+#include "DuplexPort.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/events/AddPortEvent.h b/src/libs/engine/events/AddPortEvent.hpp
index ed382286..803e0910 100644
--- a/src/libs/engine/events/AddPortEvent.h
+++ b/src/libs/engine/events/AddPortEvent.hpp
@@ -18,10 +18,10 @@
 #ifndef ADDPORTEVENT_H
 #define ADDPORTEVENT_H
 
-#include "QueuedEvent.h"
-#include <raul/Path.h>
-#include <raul/Array.h>
-#include "DataType.h"
+#include "QueuedEvent.hpp"
+#include <raul/Path.hpp>
+#include <raul/Array.hpp>
+#include "DataType.hpp"
 #include <string>
 using std::string;
 
diff --git a/src/libs/engine/events/AllNotesOffEvent.cpp b/src/libs/engine/events/AllNotesOffEvent.cpp
index 1b7a40e1..6be698c6 100644
--- a/src/libs/engine/events/AllNotesOffEvent.cpp
+++ b/src/libs/engine/events/AllNotesOffEvent.cpp
@@ -15,10 +15,10 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "AllNotesOffEvent.h"
-#include "interface/Responder.h"
-#include "Engine.h"
-#include "ObjectStore.h"
+#include "AllNotesOffEvent.hpp"
+#include "interface/Responder.hpp"
+#include "Engine.hpp"
+#include "ObjectStore.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/events/AllNotesOffEvent.h b/src/libs/engine/events/AllNotesOffEvent.hpp
index 299e9760..5e29f780 100644
--- a/src/libs/engine/events/AllNotesOffEvent.h
+++ b/src/libs/engine/events/AllNotesOffEvent.hpp
@@ -18,7 +18,7 @@
 #ifndef ALLNOTESOFFEVENT_H
 #define ALLNOTESOFFEVENT_H
 
-#include "Event.h"
+#include "Event.hpp"
 #include <string>
 using std::string;
 
diff --git a/src/libs/engine/events/ClearPatchEvent.cpp b/src/libs/engine/events/ClearPatchEvent.cpp
index 44a23267..8ac8c23d 100644
--- a/src/libs/engine/events/ClearPatchEvent.cpp
+++ b/src/libs/engine/events/ClearPatchEvent.cpp
@@ -15,18 +15,18 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "ClearPatchEvent.h"
-#include "interface/Responder.h"
-#include "Engine.h"
-#include "Patch.h"
-#include "ClientBroadcaster.h"
-#include "util.h"
-#include "ObjectStore.h"
-#include "Port.h"
-#include <raul/Maid.h>
-#include "Node.h"
-#include "Connection.h"
-#include "QueuedEventSource.h"
+#include "ClearPatchEvent.hpp"
+#include "interface/Responder.hpp"
+#include "Engine.hpp"
+#include "Patch.hpp"
+#include "ClientBroadcaster.hpp"
+#include "util.hpp"
+#include "ObjectStore.hpp"
+#include "Port.hpp"
+#include <raul/Maid.hpp>
+#include "Node.hpp"
+#include "Connection.hpp"
+#include "QueuedEventSource.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/events/ClearPatchEvent.h b/src/libs/engine/events/ClearPatchEvent.hpp
index 21b227ca..4d631f07 100644
--- a/src/libs/engine/events/ClearPatchEvent.h
+++ b/src/libs/engine/events/ClearPatchEvent.hpp
@@ -19,8 +19,8 @@
 #define CLEARPATCHEVENT_H
 
 #include <string>
-#include <raul/Array.h>
-#include "QueuedEvent.h"
+#include <raul/Array.hpp>
+#include "QueuedEvent.hpp"
 
 using std::string;
 
diff --git a/src/libs/engine/events/ConnectionEvent.cpp b/src/libs/engine/events/ConnectionEvent.cpp
index 8952e281..c1fd3180 100644
--- a/src/libs/engine/events/ConnectionEvent.cpp
+++ b/src/libs/engine/events/ConnectionEvent.cpp
@@ -15,20 +15,20 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "ConnectionEvent.h"
+#include "ConnectionEvent.hpp"
 #include <string>
-#include <raul/Maid.h>
-#include <raul/Path.h>
-#include "interface/Responder.h"
-#include "types.h"
-#include "Engine.h"
-#include "Connection.h"
-#include "InputPort.h"
-#include "OutputPort.h"
-#include "Patch.h"
-#include "ClientBroadcaster.h"
-#include "Port.h"
-#include "ObjectStore.h"
+#include <raul/Maid.hpp>
+#include <raul/Path.hpp>
+#include "interface/Responder.hpp"
+#include "types.hpp"
+#include "Engine.hpp"
+#include "Connection.hpp"
+#include "InputPort.hpp"
+#include "OutputPort.hpp"
+#include "Patch.hpp"
+#include "ClientBroadcaster.hpp"
+#include "Port.hpp"
+#include "ObjectStore.hpp"
 
 using std::string;
 namespace Ingen {
diff --git a/src/libs/engine/events/ConnectionEvent.h b/src/libs/engine/events/ConnectionEvent.hpp
index d294657b..f2903b94 100644
--- a/src/libs/engine/events/ConnectionEvent.h
+++ b/src/libs/engine/events/ConnectionEvent.hpp
@@ -19,9 +19,9 @@
 #define CONNECTIONEVENT_H
 
 #include <string>
-#include "QueuedEvent.h"
-#include <raul/Path.h>
-#include "types.h"
+#include "QueuedEvent.hpp"
+#include <raul/Path.hpp>
+#include "types.hpp"
 using std::string;
 
 namespace Raul {
diff --git a/src/libs/engine/events/CreatePatchEvent.cpp b/src/libs/engine/events/CreatePatchEvent.cpp
index f42b895e..866420d7 100644
--- a/src/libs/engine/events/CreatePatchEvent.cpp
+++ b/src/libs/engine/events/CreatePatchEvent.cpp
@@ -15,18 +15,18 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "CreatePatchEvent.h"
-#include "interface/Responder.h"
-#include "Patch.h"
-#include "Node.h"
-#include "Tree.h"
-#include "Plugin.h"
-#include "Engine.h"
-#include <raul/Maid.h>
-#include "ClientBroadcaster.h"
-#include "AudioDriver.h"
-#include <raul/Path.h>
-#include "ObjectStore.h"
+#include "CreatePatchEvent.hpp"
+#include "interface/Responder.hpp"
+#include "Patch.hpp"
+#include "Node.hpp"
+#include "Tree.hpp"
+#include "Plugin.hpp"
+#include "Engine.hpp"
+#include <raul/Maid.hpp>
+#include "ClientBroadcaster.hpp"
+#include "AudioDriver.hpp"
+#include <raul/Path.hpp>
+#include "ObjectStore.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/events/CreatePatchEvent.h b/src/libs/engine/events/CreatePatchEvent.hpp
index c63fd566..977abbaa 100644
--- a/src/libs/engine/events/CreatePatchEvent.h
+++ b/src/libs/engine/events/CreatePatchEvent.hpp
@@ -19,8 +19,8 @@
 #define CREATEPATCHEVENT_H
 
 #include <string>
-#include <raul/Path.h>
-#include "QueuedEvent.h"
+#include <raul/Path.hpp>
+#include "QueuedEvent.hpp"
 
 using std::string;
 
diff --git a/src/libs/engine/events/DSSIConfigureEvent.cpp b/src/libs/engine/events/DSSIConfigureEvent.cpp
index 4f388558..9a0142c8 100644
--- a/src/libs/engine/events/DSSIConfigureEvent.cpp
+++ b/src/libs/engine/events/DSSIConfigureEvent.cpp
@@ -15,12 +15,12 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "DSSIConfigureEvent.h"
-#include "Engine.h"
-#include "Node.h"
-#include "ClientBroadcaster.h"
-#include "Plugin.h"
-#include "ObjectStore.h"
+#include "DSSIConfigureEvent.hpp"
+#include "Engine.hpp"
+#include "Node.hpp"
+#include "ClientBroadcaster.hpp"
+#include "Plugin.hpp"
+#include "ObjectStore.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/events/DSSIConfigureEvent.h b/src/libs/engine/events/DSSIConfigureEvent.hpp
index 944f6239..ef37c5cd 100644
--- a/src/libs/engine/events/DSSIConfigureEvent.h
+++ b/src/libs/engine/events/DSSIConfigureEvent.hpp
@@ -18,8 +18,8 @@
 #ifndef DSSICONFIGUREEVENT_H
 #define DSSICONFIGUREEVENT_H
 
-#include "QueuedEvent.h"
-#include "DSSINode.h"
+#include "QueuedEvent.hpp"
+#include "DSSINode.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/events/DSSIControlEvent.cpp b/src/libs/engine/events/DSSIControlEvent.cpp
index 94f504a7..eef5054b 100644
--- a/src/libs/engine/events/DSSIControlEvent.cpp
+++ b/src/libs/engine/events/DSSIControlEvent.cpp
@@ -15,11 +15,11 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "DSSIControlEvent.h"
-#include "Engine.h"
-#include "Node.h"
-#include "Plugin.h"
-#include "ObjectStore.h"
+#include "DSSIControlEvent.hpp"
+#include "Engine.hpp"
+#include "Node.hpp"
+#include "Plugin.hpp"
+#include "ObjectStore.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/events/DSSIControlEvent.h b/src/libs/engine/events/DSSIControlEvent.hpp
index e6800bb2..ab48607a 100644
--- a/src/libs/engine/events/DSSIControlEvent.h
+++ b/src/libs/engine/events/DSSIControlEvent.hpp
@@ -18,8 +18,8 @@
 #ifndef DSSICONTROLEVENT_H
 #define DSSICONTROLEVENT_H
 
-#include "QueuedEvent.h"
-#include "DSSINode.h"
+#include "QueuedEvent.hpp"
+#include "DSSINode.hpp"
 
 namespace Ingen {
 	
diff --git a/src/libs/engine/events/DSSIProgramEvent.cpp b/src/libs/engine/events/DSSIProgramEvent.cpp
index 436ab2c6..66ad9c1f 100644
--- a/src/libs/engine/events/DSSIProgramEvent.cpp
+++ b/src/libs/engine/events/DSSIProgramEvent.cpp
@@ -15,14 +15,14 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "DSSIProgramEvent.h"
+#include "DSSIProgramEvent.hpp"
 #include <cstdio>
 #include <iostream>
-#include "Engine.h"
-#include "Node.h"
-#include "ClientBroadcaster.h"
-#include "Plugin.h"
-#include "ObjectStore.h"
+#include "Engine.hpp"
+#include "Node.hpp"
+#include "ClientBroadcaster.hpp"
+#include "Plugin.hpp"
+#include "ObjectStore.hpp"
 using std::cout; using std::cerr; using std::endl;
 
 
diff --git a/src/libs/engine/events/DSSIProgramEvent.h b/src/libs/engine/events/DSSIProgramEvent.hpp
index 8acdea81..2f853961 100644
--- a/src/libs/engine/events/DSSIProgramEvent.h
+++ b/src/libs/engine/events/DSSIProgramEvent.hpp
@@ -18,8 +18,8 @@
 #ifndef DSSIPROGRAMEVENT_H
 #define DSSIPROGRAMEVENT_H
 
-#include "QueuedEvent.h"
-#include "DSSINode.h"
+#include "QueuedEvent.hpp"
+#include "DSSINode.hpp"
 
 namespace Ingen {	
 
diff --git a/src/libs/engine/events/DSSIUpdateEvent.cpp b/src/libs/engine/events/DSSIUpdateEvent.cpp
index 5851e065..055be90c 100644
--- a/src/libs/engine/events/DSSIUpdateEvent.cpp
+++ b/src/libs/engine/events/DSSIUpdateEvent.cpp
@@ -15,13 +15,13 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "DSSIUpdateEvent.h"
+#include "DSSIUpdateEvent.hpp"
 #include <iostream>
-#include "Node.h"
-#include "ObjectStore.h"
-#include "Engine.h"
-#include "DSSINode.h"
-#include "Plugin.h"
+#include "Node.hpp"
+#include "ObjectStore.hpp"
+#include "Engine.hpp"
+#include "DSSINode.hpp"
+#include "Plugin.hpp"
 
 using std::cerr; using std::endl;
 
diff --git a/src/libs/engine/events/DSSIUpdateEvent.h b/src/libs/engine/events/DSSIUpdateEvent.hpp
index 8274bb71..699df4c2 100644
--- a/src/libs/engine/events/DSSIUpdateEvent.h
+++ b/src/libs/engine/events/DSSIUpdateEvent.hpp
@@ -18,7 +18,7 @@
 #ifndef DSSIUPDATEEVENT_H
 #define DSSIUPDATEEVENT_H
 
-#include "QueuedEvent.h"
+#include "QueuedEvent.hpp"
 #include <string>
 
 using std::string;
diff --git a/src/libs/engine/events/DeactivateEvent.cpp b/src/libs/engine/events/DeactivateEvent.cpp
index e6440570..311cf287 100644
--- a/src/libs/engine/events/DeactivateEvent.cpp
+++ b/src/libs/engine/events/DeactivateEvent.cpp
@@ -15,9 +15,9 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "DeactivateEvent.h"
-#include "interface/Responder.h"
-#include "Engine.h"
+#include "DeactivateEvent.hpp"
+#include "interface/Responder.hpp"
+#include "Engine.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/events/DeactivateEvent.h b/src/libs/engine/events/DeactivateEvent.hpp
index 92276918..1f87e271 100644
--- a/src/libs/engine/events/DeactivateEvent.h
+++ b/src/libs/engine/events/DeactivateEvent.hpp
@@ -18,7 +18,7 @@
 #ifndef DEACTIVATEEVENT_H
 #define DEACTIVATEEVENT_H
 
-#include "QueuedEvent.h"
+#include "QueuedEvent.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/events/DestroyEvent.cpp b/src/libs/engine/events/DestroyEvent.cpp
index ecccaa8a..dde2e86b 100644
--- a/src/libs/engine/events/DestroyEvent.cpp
+++ b/src/libs/engine/events/DestroyEvent.cpp
@@ -15,24 +15,24 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "DestroyEvent.h"
-#include "interface/Responder.h"
-#include "Engine.h"
-#include "Patch.h"
-#include "Tree.h"
-#include "Node.h"
-#include "Plugin.h"
-#include "AudioDriver.h"
-#include "MidiDriver.h"
-#include "InternalNode.h"
-#include "DisconnectNodeEvent.h"
-#include "DisconnectPortEvent.h"
-#include "ClientBroadcaster.h"
-#include <raul/Maid.h>
-#include "ObjectStore.h"
-#include <raul/Path.h>
-#include "QueuedEventSource.h"
-#include "Port.h"
+#include "DestroyEvent.hpp"
+#include "interface/Responder.hpp"
+#include "Engine.hpp"
+#include "Patch.hpp"
+#include "Tree.hpp"
+#include "Node.hpp"
+#include "Plugin.hpp"
+#include "AudioDriver.hpp"
+#include "MidiDriver.hpp"
+#include "InternalNode.hpp"
+#include "DisconnectNodeEvent.hpp"
+#include "DisconnectPortEvent.hpp"
+#include "ClientBroadcaster.hpp"
+#include <raul/Maid.hpp>
+#include "ObjectStore.hpp"
+#include <raul/Path.hpp>
+#include "QueuedEventSource.hpp"
+#include "Port.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/events/DestroyEvent.h b/src/libs/engine/events/DestroyEvent.hpp
index 421a2dcd..6495258e 100644
--- a/src/libs/engine/events/DestroyEvent.h
+++ b/src/libs/engine/events/DestroyEvent.hpp
@@ -19,8 +19,8 @@
 #define DESTROYEVENT_H
 
 #include <string>
-#include <raul/Path.h>
-#include "QueuedEvent.h"
+#include <raul/Path.hpp>
+#include "QueuedEvent.hpp"
 
 
 using std::string;
diff --git a/src/libs/engine/events/DisablePatchEvent.cpp b/src/libs/engine/events/DisablePatchEvent.cpp
index ce78cf7e..80ea96fa 100644
--- a/src/libs/engine/events/DisablePatchEvent.cpp
+++ b/src/libs/engine/events/DisablePatchEvent.cpp
@@ -15,14 +15,14 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "DisablePatchEvent.h"
-#include "interface/Responder.h"
-#include "Engine.h"
-#include "Patch.h"
-#include "ClientBroadcaster.h"
-#include "util.h"
-#include "ObjectStore.h"
-#include "Port.h"
+#include "DisablePatchEvent.hpp"
+#include "interface/Responder.hpp"
+#include "Engine.hpp"
+#include "Patch.hpp"
+#include "ClientBroadcaster.hpp"
+#include "util.hpp"
+#include "ObjectStore.hpp"
+#include "Port.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/events/DisablePatchEvent.h b/src/libs/engine/events/DisablePatchEvent.hpp
index 1999ece0..1552fffe 100644
--- a/src/libs/engine/events/DisablePatchEvent.h
+++ b/src/libs/engine/events/DisablePatchEvent.hpp
@@ -19,7 +19,7 @@
 #define DISABLEPATCHEVENT_H
 
 #include <string>
-#include "QueuedEvent.h"
+#include "QueuedEvent.hpp"
 
 using std::string;
 
diff --git a/src/libs/engine/events/DisconnectNodeEvent.cpp b/src/libs/engine/events/DisconnectNodeEvent.cpp
index bc97dff4..abdad386 100644
--- a/src/libs/engine/events/DisconnectNodeEvent.cpp
+++ b/src/libs/engine/events/DisconnectNodeEvent.cpp
@@ -15,24 +15,24 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "DisconnectNodeEvent.h"
+#include "DisconnectNodeEvent.hpp"
 #include <iostream>
-#include <raul/List.h>
-#include <raul/Array.h>
-#include <raul/Maid.h>
-#include "interface/Responder.h"
-#include "Engine.h"
-#include "Node.h"
-#include "Connection.h"
-#include "DisconnectionEvent.h"
-#include "Port.h"
-#include "InputPort.h"
-#include "OutputPort.h"
-#include "Patch.h"
-#include "ClientBroadcaster.h"
-#include "util.h"
-#include "ObjectStore.h"
-#include <raul/Path.h>
+#include <raul/List.hpp>
+#include <raul/Array.hpp>
+#include <raul/Maid.hpp>
+#include "interface/Responder.hpp"
+#include "Engine.hpp"
+#include "Node.hpp"
+#include "Connection.hpp"
+#include "DisconnectionEvent.hpp"
+#include "Port.hpp"
+#include "InputPort.hpp"
+#include "OutputPort.hpp"
+#include "Patch.hpp"
+#include "ClientBroadcaster.hpp"
+#include "util.hpp"
+#include "ObjectStore.hpp"
+#include <raul/Path.hpp>
 
 using std::cerr; using std::endl;
 
diff --git a/src/libs/engine/events/DisconnectNodeEvent.h b/src/libs/engine/events/DisconnectNodeEvent.hpp
index a70f9e8c..e14f87fa 100644
--- a/src/libs/engine/events/DisconnectNodeEvent.h
+++ b/src/libs/engine/events/DisconnectNodeEvent.hpp
@@ -19,9 +19,9 @@
 #define DISCONNECTNODEEVENT_H
 
 #include <string>
-#include <raul/List.h>
-#include <raul/Path.h>
-#include "QueuedEvent.h"
+#include <raul/List.hpp>
+#include <raul/Path.hpp>
+#include "QueuedEvent.hpp"
 
 using std::string;
 
diff --git a/src/libs/engine/events/DisconnectPortEvent.cpp b/src/libs/engine/events/DisconnectPortEvent.cpp
index 1373d9b8..0956ca8f 100644
--- a/src/libs/engine/events/DisconnectPortEvent.cpp
+++ b/src/libs/engine/events/DisconnectPortEvent.cpp
@@ -16,23 +16,23 @@
  */
 
 #include <iostream>
-#include <raul/Maid.h>
-#include <raul/List.h>
-#include <raul/Path.h>
-#include <raul/Array.h>
-#include "interface/Responder.h"
-#include "Engine.h"
-#include "Node.h"
-#include "Connection.h"
-#include "DisconnectionEvent.h"
-#include "Port.h"
-#include "InputPort.h"
-#include "OutputPort.h"
-#include "Patch.h"
-#include "ClientBroadcaster.h"
-#include "util.h"
-#include "ObjectStore.h"
-#include "DisconnectPortEvent.h"
+#include <raul/Maid.hpp>
+#include <raul/List.hpp>
+#include <raul/Path.hpp>
+#include <raul/Array.hpp>
+#include "interface/Responder.hpp"
+#include "Engine.hpp"
+#include "Node.hpp"
+#include "Connection.hpp"
+#include "DisconnectionEvent.hpp"
+#include "Port.hpp"
+#include "InputPort.hpp"
+#include "OutputPort.hpp"
+#include "Patch.hpp"
+#include "ClientBroadcaster.hpp"
+#include "util.hpp"
+#include "ObjectStore.hpp"
+#include "DisconnectPortEvent.hpp"
 
 using std::cerr; using std::endl;
 
diff --git a/src/libs/engine/events/DisconnectPortEvent.h b/src/libs/engine/events/DisconnectPortEvent.hpp
index 647ee1da..95644098 100644
--- a/src/libs/engine/events/DisconnectPortEvent.h
+++ b/src/libs/engine/events/DisconnectPortEvent.hpp
@@ -19,9 +19,9 @@
 #define DISCONNECTPORTEVENT_H
 
 #include <string>
-#include <raul/Path.h>
-#include "QueuedEvent.h"
-#include <raul/List.h>
+#include <raul/Path.hpp>
+#include "QueuedEvent.hpp"
+#include <raul/List.hpp>
 
 namespace Raul { template <typename T> class Array; }
 
diff --git a/src/libs/engine/events/DisconnectionEvent.cpp b/src/libs/engine/events/DisconnectionEvent.cpp
index 2fafb98e..ba35f84e 100644
--- a/src/libs/engine/events/DisconnectionEvent.cpp
+++ b/src/libs/engine/events/DisconnectionEvent.cpp
@@ -15,19 +15,19 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "DisconnectionEvent.h"
+#include "DisconnectionEvent.hpp"
 #include <string>
-#include <raul/Maid.h>
-#include <raul/Path.h>
-#include "interface/Responder.h"
-#include "Engine.h"
-#include "Connection.h"
-#include "InputPort.h"
-#include "OutputPort.h"
-#include "Patch.h"
-#include "ClientBroadcaster.h"
-#include "Port.h"
-#include "ObjectStore.h"
+#include <raul/Maid.hpp>
+#include <raul/Path.hpp>
+#include "interface/Responder.hpp"
+#include "Engine.hpp"
+#include "Connection.hpp"
+#include "InputPort.hpp"
+#include "OutputPort.hpp"
+#include "Patch.hpp"
+#include "ClientBroadcaster.hpp"
+#include "Port.hpp"
+#include "ObjectStore.hpp"
 
 using std::string;
 namespace Ingen {
diff --git a/src/libs/engine/events/DisconnectionEvent.h b/src/libs/engine/events/DisconnectionEvent.hpp
index 23f1526e..9c5b7490 100644
--- a/src/libs/engine/events/DisconnectionEvent.h
+++ b/src/libs/engine/events/DisconnectionEvent.hpp
@@ -19,9 +19,9 @@
 #define DISCONNECTIONEVENT_H
 
 #include <string>
-#include <raul/Path.h>
-#include "QueuedEvent.h"
-#include "types.h"
+#include <raul/Path.hpp>
+#include "QueuedEvent.hpp"
+#include "types.hpp"
 using std::string;
 
 namespace Raul {
diff --git a/src/libs/engine/events/EnablePatchEvent.cpp b/src/libs/engine/events/EnablePatchEvent.cpp
index 74d4a52b..1921b301 100644
--- a/src/libs/engine/events/EnablePatchEvent.cpp
+++ b/src/libs/engine/events/EnablePatchEvent.cpp
@@ -15,13 +15,13 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "EnablePatchEvent.h"
-#include "interface/Responder.h"
-#include "Engine.h"
-#include "Patch.h"
-#include "util.h"
-#include "ClientBroadcaster.h"
-#include "ObjectStore.h"
+#include "EnablePatchEvent.hpp"
+#include "interface/Responder.hpp"
+#include "Engine.hpp"
+#include "Patch.hpp"
+#include "util.hpp"
+#include "ClientBroadcaster.hpp"
+#include "ObjectStore.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/events/EnablePatchEvent.h b/src/libs/engine/events/EnablePatchEvent.hpp
index c63c9db3..0a74c082 100644
--- a/src/libs/engine/events/EnablePatchEvent.h
+++ b/src/libs/engine/events/EnablePatchEvent.hpp
@@ -19,7 +19,7 @@
 #define ENABLEPATCHEVENT_H
 
 #include <string>
-#include "QueuedEvent.h"
+#include "QueuedEvent.hpp"
 
 using std::string;
 
diff --git a/src/libs/engine/events/LoadPluginsEvent.cpp b/src/libs/engine/events/LoadPluginsEvent.cpp
index b06d1817..04db153c 100644
--- a/src/libs/engine/events/LoadPluginsEvent.cpp
+++ b/src/libs/engine/events/LoadPluginsEvent.cpp
@@ -15,12 +15,12 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "LoadPluginsEvent.h"
-#include "interface/Responder.h"
-#include "Engine.h"
-#include "NodeFactory.h"
-#include "ClientBroadcaster.h"
-#include "QueuedEventSource.h"
+#include "LoadPluginsEvent.hpp"
+#include "interface/Responder.hpp"
+#include "Engine.hpp"
+#include "NodeFactory.hpp"
+#include "ClientBroadcaster.hpp"
+#include "QueuedEventSource.hpp"
 
 #include <iostream>
 using std::cerr;
diff --git a/src/libs/engine/events/LoadPluginsEvent.h b/src/libs/engine/events/LoadPluginsEvent.hpp
index e56de796..c6f886f7 100644
--- a/src/libs/engine/events/LoadPluginsEvent.h
+++ b/src/libs/engine/events/LoadPluginsEvent.hpp
@@ -19,7 +19,7 @@
 #define LOADPLUGINSEVENT_H
 
 #include <list>
-#include "QueuedEvent.h"
+#include "QueuedEvent.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/events/Makefile.am b/src/libs/engine/events/Makefile.am
index e54c527a..bc698678 100644
--- a/src/libs/engine/events/Makefile.am
+++ b/src/libs/engine/events/Makefile.am
@@ -1,69 +1,69 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 EXTRA_DIST = \
-	RegisterClientEvent.h \
-	RegisterClientEvent.cpp \
-	UnregisterClientEvent.h \
-	UnregisterClientEvent.cpp \
-	PingQueuedEvent.h \
-	DeactivateEvent.h \
-	DeactivateEvent.cpp \
-	SetPortValueEvent.h \
-	SetPortValueEvent.cpp \
-	SetPortValueQueuedEvent.h \
-	SetPortValueQueuedEvent.cpp \
-	NoteOnEvent.h \
-	NoteOnEvent.cpp \
-	NoteOffEvent.h \
-	NoteOffEvent.cpp \
-	AllNotesOffEvent.h \
+	AddNodeEvent.cpp \
+	AddNodeEvent.hpp \
 	AllNotesOffEvent.cpp \
-	ConnectionEvent.h \
+	AllNotesOffEvent.hpp \
+	ClearPatchEvent.cpp \
+	ClearPatchEvent.hpp \
 	ConnectionEvent.cpp \
-	DisconnectionEvent.h \
-	DisconnectionEvent.cpp \
-	DisconnectNodeEvent.h \
-	DisconnectNodeEvent.cpp \
-	DisconnectPortEvent.h \
-	DisconnectPortEvent.cpp \
-	DestroyEvent.h \
-	DestroyEvent.cpp \
-	AddNodeEvent.h \
-	AddNodeEvent.cpp \
-	SetMetadataEvent.h \
-	SetMetadataEvent.cpp \
-	RequestMetadataEvent.h \
-	RequestMetadataEvent.cpp \
-	RequestPluginEvent.h \
-	RequestPluginEvent.cpp \
-	RequestObjectEvent.h \
-	RequestObjectEvent.cpp \
-	RequestPortValueEvent.h \
-	RequestPortValueEvent.cpp \
-	RequestAllObjectsEvent.h \
-	RequestAllObjectsEvent.cpp \
-	RequestPluginsEvent.h \
-	RequestPluginsEvent.cpp \
-	CreatePatchEvent.h \
+	ConnectionEvent.hpp \
 	CreatePatchEvent.cpp \
-	LoadPluginsEvent.h \
-	LoadPluginsEvent.cpp \
-	EnablePatchEvent.h \
-	EnablePatchEvent.cpp \
-	DisablePatchEvent.h \
-	DisablePatchEvent.cpp \
-	ClearPatchEvent.h \
-	ClearPatchEvent.cpp \
-	RenameEvent.h \
-	RenameEvent.cpp \
-	MidiLearnEvent.h \
-	MidiLearnEvent.cpp \
+	CreatePatchEvent.hpp \
 	DSSIConfigureEvent.cpp \
-	DSSIConfigureEvent.h \
+	DSSIConfigureEvent.hpp \
 	DSSIControlEvent.cpp \
-	DSSIControlEvent.h \
+	DSSIControlEvent.hpp \
 	DSSIProgramEvent.cpp \
-	DSSIProgramEvent.h \
+	DSSIProgramEvent.hpp \
 	DSSIUpdateEvent.cpp \
-	DSSIUpdateEvent.h
+	DSSIUpdateEvent.hpp \
+	DeactivateEvent.cpp \
+	DeactivateEvent.hpp \
+	DestroyEvent.cpp \
+	DestroyEvent.hpp \
+	DisablePatchEvent.cpp \
+	DisablePatchEvent.hpp \
+	DisconnectNodeEvent.cpp \
+	DisconnectNodeEvent.hpp \
+	DisconnectPortEvent.cpp \
+	DisconnectPortEvent.hpp \
+	DisconnectionEvent.cpp \
+	DisconnectionEvent.hpp \
+	EnablePatchEvent.cpp \
+	EnablePatchEvent.hpp \
+	LoadPluginsEvent.cpp \
+	LoadPluginsEvent.hpp \
+	MidiLearnEvent.cpp \
+	MidiLearnEvent.hpp \
+	NoteOffEvent.cpp \
+	NoteOffEvent.hpp \
+	NoteOnEvent.cpp \
+	NoteOnEvent.hpp \
+	PingQueuedEvent.hpp \
+	RegisterClientEvent.cpp \
+	RegisterClientEvent.hpp \
+	RenameEvent.cpp \
+	RenameEvent.hpp \
+	RequestAllObjectsEvent.cpp \
+	RequestAllObjectsEvent.hpp \
+	RequestMetadataEvent.cpp \
+	RequestMetadataEvent.hpp \
+	RequestObjectEvent.cpp \
+	RequestObjectEvent.hpp \
+	RequestPluginEvent.cpp \
+	RequestPluginEvent.hpp \
+	RequestPluginsEvent.cpp \
+	RequestPluginsEvent.hpp \
+	RequestPortValueEvent.cpp \
+	RequestPortValueEvent.hpp \
+	SetMetadataEvent.cpp \
+	SetMetadataEvent.hpp \
+	SetPortValueEvent.cpp \
+	SetPortValueEvent.hpp \
+	SetPortValueQueuedEvent.cpp \
+	SetPortValueQueuedEvent.hpp \
+	UnregisterClientEvent.cpp \
+	UnregisterClientEvent.hpp
 
diff --git a/src/libs/engine/events/MidiLearnEvent.cpp b/src/libs/engine/events/MidiLearnEvent.cpp
index 6204ed4a..8bc05b4f 100644
--- a/src/libs/engine/events/MidiLearnEvent.cpp
+++ b/src/libs/engine/events/MidiLearnEvent.cpp
@@ -15,13 +15,13 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "MidiLearnEvent.h"
-#include "interface/Responder.h"
-#include "Engine.h"
-#include "ObjectStore.h"
-#include "Node.h"
-#include "MidiControlNode.h"
-#include "ClientBroadcaster.h"
+#include "MidiLearnEvent.hpp"
+#include "interface/Responder.hpp"
+#include "Engine.hpp"
+#include "ObjectStore.hpp"
+#include "Node.hpp"
+#include "MidiControlNode.hpp"
+#include "ClientBroadcaster.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/events/MidiLearnEvent.h b/src/libs/engine/events/MidiLearnEvent.hpp
index d28413c7..c5a0902f 100644
--- a/src/libs/engine/events/MidiLearnEvent.h
+++ b/src/libs/engine/events/MidiLearnEvent.hpp
@@ -18,9 +18,9 @@
 #ifndef MIDILEARNEVENT_H
 #define MIDILEARNEVENT_H
 
-#include "QueuedEvent.h"
-#include "MidiControlNode.h"
-#include "types.h"
+#include "QueuedEvent.hpp"
+#include "MidiControlNode.hpp"
+#include "types.hpp"
 #include <string>
 using std::string;
 
diff --git a/src/libs/engine/events/NoteOffEvent.cpp b/src/libs/engine/events/NoteOffEvent.cpp
index cb081534..a8da7669 100644
--- a/src/libs/engine/events/NoteOffEvent.cpp
+++ b/src/libs/engine/events/NoteOffEvent.cpp
@@ -15,13 +15,13 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "NoteOffEvent.h"
-#include "interface/Responder.h"
-#include "Engine.h"
-#include "ObjectStore.h"
-#include "Node.h"
-#include "MidiNoteNode.h"
-#include "MidiTriggerNode.h"
+#include "NoteOffEvent.hpp"
+#include "interface/Responder.hpp"
+#include "Engine.hpp"
+#include "ObjectStore.hpp"
+#include "Node.hpp"
+#include "MidiNoteNode.hpp"
+#include "MidiTriggerNode.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/events/NoteOffEvent.h b/src/libs/engine/events/NoteOffEvent.hpp
index 423ddcdc..4186cbed 100644
--- a/src/libs/engine/events/NoteOffEvent.h
+++ b/src/libs/engine/events/NoteOffEvent.hpp
@@ -18,8 +18,8 @@
 #ifndef NOTEOFFEVENT_H
 #define NOTEOFFEVENT_H
 
-#include "Event.h"
-#include "types.h"
+#include "Event.hpp"
+#include "types.hpp"
 #include <string>
 using std::string;
 
diff --git a/src/libs/engine/events/NoteOnEvent.cpp b/src/libs/engine/events/NoteOnEvent.cpp
index 313dbccd..5bd57d93 100644
--- a/src/libs/engine/events/NoteOnEvent.cpp
+++ b/src/libs/engine/events/NoteOnEvent.cpp
@@ -15,14 +15,14 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "NoteOnEvent.h"
-#include "interface/Responder.h"
-#include "Engine.h"
-#include "ObjectStore.h"
-#include "Node.h"
-#include "MidiNoteNode.h"
-#include "MidiTriggerNode.h"
-#include "Plugin.h"
+#include "NoteOnEvent.hpp"
+#include "interface/Responder.hpp"
+#include "Engine.hpp"
+#include "ObjectStore.hpp"
+#include "Node.hpp"
+#include "MidiNoteNode.hpp"
+#include "MidiTriggerNode.hpp"
+#include "Plugin.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/events/NoteOnEvent.h b/src/libs/engine/events/NoteOnEvent.hpp
index a3ee4210..3a641a55 100644
--- a/src/libs/engine/events/NoteOnEvent.h
+++ b/src/libs/engine/events/NoteOnEvent.hpp
@@ -18,8 +18,8 @@
 #ifndef NOTEONEVENT_H
 #define NOTEONEVENT_H
 
-#include "Event.h"
-#include "types.h"
+#include "Event.hpp"
+#include "types.hpp"
 #include <string>
 using std::string;
 
diff --git a/src/libs/engine/events/PingQueuedEvent.h b/src/libs/engine/events/PingQueuedEvent.hpp
index 3d331ccf..9712a904 100644
--- a/src/libs/engine/events/PingQueuedEvent.h
+++ b/src/libs/engine/events/PingQueuedEvent.hpp
@@ -18,9 +18,9 @@
 #ifndef PINGQUEUEDEVENT_H
 #define PINGQUEUEDEVENT_H
 
-#include "QueuedEvent.h"
-#include "types.h"
-#include "interface/Responder.h"
+#include "QueuedEvent.hpp"
+#include "types.hpp"
+#include "interface/Responder.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/events/RegisterClientEvent.cpp b/src/libs/engine/events/RegisterClientEvent.cpp
index 3ba36cc7..ace2b3e0 100644
--- a/src/libs/engine/events/RegisterClientEvent.cpp
+++ b/src/libs/engine/events/RegisterClientEvent.cpp
@@ -15,10 +15,10 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "interface/Responder.h"
-#include "RegisterClientEvent.h"
-#include "Engine.h"
-#include "ClientBroadcaster.h"
+#include "interface/Responder.hpp"
+#include "RegisterClientEvent.hpp"
+#include "Engine.hpp"
+#include "ClientBroadcaster.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/events/RegisterClientEvent.h b/src/libs/engine/events/RegisterClientEvent.hpp
index f32093a4..be02fd41 100644
--- a/src/libs/engine/events/RegisterClientEvent.h
+++ b/src/libs/engine/events/RegisterClientEvent.hpp
@@ -18,9 +18,9 @@
 #ifndef REGISTERCLIENTEVENT_H
 #define REGISTERCLIENTEVENT_H
 
-#include "QueuedEvent.h"
-#include "interface/ClientKey.h"
-#include "interface/ClientInterface.h"
+#include "QueuedEvent.hpp"
+#include "interface/ClientKey.hpp"
+#include "interface/ClientInterface.hpp"
 #include <string>
 using std::string;
 using Ingen::Shared::ClientInterface;
diff --git a/src/libs/engine/events/RenameEvent.cpp b/src/libs/engine/events/RenameEvent.cpp
index ac9082e6..035bd005 100644
--- a/src/libs/engine/events/RenameEvent.cpp
+++ b/src/libs/engine/events/RenameEvent.cpp
@@ -15,15 +15,15 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "RenameEvent.h"
-#include "interface/Responder.h"
-#include "Patch.h"
-#include "Node.h"
-#include "Tree.h"
-#include "Engine.h"
-#include "ClientBroadcaster.h"
-#include <raul/Path.h>
-#include "ObjectStore.h"
+#include "RenameEvent.hpp"
+#include "interface/Responder.hpp"
+#include "Patch.hpp"
+#include "Node.hpp"
+#include "Tree.hpp"
+#include "Engine.hpp"
+#include "ClientBroadcaster.hpp"
+#include <raul/Path.hpp>
+#include "ObjectStore.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/events/RenameEvent.h b/src/libs/engine/events/RenameEvent.hpp
index c0d1e538..f50efcc7 100644
--- a/src/libs/engine/events/RenameEvent.h
+++ b/src/libs/engine/events/RenameEvent.hpp
@@ -19,8 +19,8 @@
 #define RENAMEEVENT_H
 
 #include <string>
-#include "QueuedEvent.h"
-#include <raul/Path.h>
+#include "QueuedEvent.hpp"
+#include <raul/Path.hpp>
 
 using std::string;
 
diff --git a/src/libs/engine/events/RequestAllObjectsEvent.cpp b/src/libs/engine/events/RequestAllObjectsEvent.cpp
index ccf5a6a1..a6940442 100644
--- a/src/libs/engine/events/RequestAllObjectsEvent.cpp
+++ b/src/libs/engine/events/RequestAllObjectsEvent.cpp
@@ -15,12 +15,12 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "RequestAllObjectsEvent.h"
-#include "interface/Responder.h"
-#include "Engine.h"
-#include "ObjectSender.h"
-#include "ClientBroadcaster.h"
-#include "ObjectStore.h"
+#include "RequestAllObjectsEvent.hpp"
+#include "interface/Responder.hpp"
+#include "Engine.hpp"
+#include "ObjectSender.hpp"
+#include "ClientBroadcaster.hpp"
+#include "ObjectStore.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/events/RequestAllObjectsEvent.h b/src/libs/engine/events/RequestAllObjectsEvent.hpp
index a0d10c49..91dfefc3 100644
--- a/src/libs/engine/events/RequestAllObjectsEvent.h
+++ b/src/libs/engine/events/RequestAllObjectsEvent.hpp
@@ -19,7 +19,7 @@
 #define REQUESTALLOBJECTSEVENT_H
 
 #include <string>
-#include "QueuedEvent.h"
+#include "QueuedEvent.hpp"
 using std::string;
 
 namespace Ingen {
diff --git a/src/libs/engine/events/RequestMetadataEvent.cpp b/src/libs/engine/events/RequestMetadataEvent.cpp
index b2f189f6..5000256f 100644
--- a/src/libs/engine/events/RequestMetadataEvent.cpp
+++ b/src/libs/engine/events/RequestMetadataEvent.cpp
@@ -15,14 +15,14 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "RequestMetadataEvent.h"
+#include "RequestMetadataEvent.hpp"
 #include <string>
-#include "interface/Responder.h"
-#include "Engine.h"
-#include "GraphObject.h"
-#include "ObjectStore.h"
-#include "interface/ClientInterface.h"
-#include "ClientBroadcaster.h"
+#include "interface/Responder.hpp"
+#include "Engine.hpp"
+#include "GraphObject.hpp"
+#include "ObjectStore.hpp"
+#include "interface/ClientInterface.hpp"
+#include "ClientBroadcaster.hpp"
 using std::string;
 
 namespace Ingen {
diff --git a/src/libs/engine/events/RequestMetadataEvent.h b/src/libs/engine/events/RequestMetadataEvent.hpp
index 45592e88..ed33e4af 100644
--- a/src/libs/engine/events/RequestMetadataEvent.h
+++ b/src/libs/engine/events/RequestMetadataEvent.hpp
@@ -19,8 +19,8 @@
 #define REQUESTMETADATAEVENT_H
 
 #include <string>
-#include "QueuedEvent.h"
-#include <raul/Atom.h>
+#include "QueuedEvent.hpp"
+#include <raul/Atom.hpp>
 using std::string;
 
 namespace Ingen {
diff --git a/src/libs/engine/events/RequestObjectEvent.cpp b/src/libs/engine/events/RequestObjectEvent.cpp
index 30ef6f85..25f95d00 100644
--- a/src/libs/engine/events/RequestObjectEvent.cpp
+++ b/src/libs/engine/events/RequestObjectEvent.cpp
@@ -15,17 +15,17 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "RequestObjectEvent.h"
+#include "RequestObjectEvent.hpp"
 #include <string>
-#include "interface/ClientInterface.h"
-#include "interface/Responder.h"
-#include "Engine.h"
-#include "ObjectStore.h"
-#include "ClientBroadcaster.h"
-#include "Patch.h"
-#include "Node.h"
-#include "Port.h"
-#include "ObjectSender.h"
+#include "interface/ClientInterface.hpp"
+#include "interface/Responder.hpp"
+#include "Engine.hpp"
+#include "ObjectStore.hpp"
+#include "ClientBroadcaster.hpp"
+#include "Patch.hpp"
+#include "Node.hpp"
+#include "Port.hpp"
+#include "ObjectSender.hpp"
 
 using std::string;
 
diff --git a/src/libs/engine/events/RequestObjectEvent.h b/src/libs/engine/events/RequestObjectEvent.hpp
index b769aee3..6731182a 100644
--- a/src/libs/engine/events/RequestObjectEvent.h
+++ b/src/libs/engine/events/RequestObjectEvent.hpp
@@ -19,8 +19,8 @@
 #define REQUESTOBJECTEVENT_H
 
 #include <string>
-#include "QueuedEvent.h"
-#include "types.h"
+#include "QueuedEvent.hpp"
+#include "types.hpp"
 
 using std::string;
 
diff --git a/src/libs/engine/events/RequestPluginEvent.cpp b/src/libs/engine/events/RequestPluginEvent.cpp
index da70cd8c..4e1a1660 100644
--- a/src/libs/engine/events/RequestPluginEvent.cpp
+++ b/src/libs/engine/events/RequestPluginEvent.cpp
@@ -15,16 +15,16 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "RequestPluginEvent.h"
+#include "RequestPluginEvent.hpp"
 #include <string>
-#include "interface/ClientInterface.h"
-#include "interface/Responder.h"
-#include "Engine.h"
-#include "Port.h"
-#include "ObjectStore.h"
-#include "ClientBroadcaster.h"
-#include "NodeFactory.h"
-#include "Plugin.h"
+#include "interface/ClientInterface.hpp"
+#include "interface/Responder.hpp"
+#include "Engine.hpp"
+#include "Port.hpp"
+#include "ObjectStore.hpp"
+#include "ClientBroadcaster.hpp"
+#include "NodeFactory.hpp"
+#include "Plugin.hpp"
 
 using std::string;
 
diff --git a/src/libs/engine/events/RequestPluginEvent.h b/src/libs/engine/events/RequestPluginEvent.hpp
index 7047e2fa..26e5a8fa 100644
--- a/src/libs/engine/events/RequestPluginEvent.h
+++ b/src/libs/engine/events/RequestPluginEvent.hpp
@@ -19,8 +19,8 @@
 #define REQUESTPLUGINEVENT_H
 
 #include <string>
-#include "QueuedEvent.h"
-#include "types.h"
+#include "QueuedEvent.hpp"
+#include "types.hpp"
 
 using std::string;
 
diff --git a/src/libs/engine/events/RequestPluginsEvent.cpp b/src/libs/engine/events/RequestPluginsEvent.cpp
index 1d71b6fa..3976dd08 100644
--- a/src/libs/engine/events/RequestPluginsEvent.cpp
+++ b/src/libs/engine/events/RequestPluginsEvent.cpp
@@ -15,11 +15,11 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "RequestPluginsEvent.h"
-#include "interface/Responder.h"
-#include "Engine.h"
-#include "ClientBroadcaster.h"
-#include "NodeFactory.h"
+#include "RequestPluginsEvent.hpp"
+#include "interface/Responder.hpp"
+#include "Engine.hpp"
+#include "ClientBroadcaster.hpp"
+#include "NodeFactory.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/events/RequestPluginsEvent.h b/src/libs/engine/events/RequestPluginsEvent.hpp
index 3d795081..fae8bf94 100644
--- a/src/libs/engine/events/RequestPluginsEvent.h
+++ b/src/libs/engine/events/RequestPluginsEvent.hpp
@@ -20,7 +20,7 @@
 
 #include <string>
 #include <list>
-#include "QueuedEvent.h"
+#include "QueuedEvent.hpp"
 using std::string;
 
 namespace Ingen {
diff --git a/src/libs/engine/events/RequestPortValueEvent.cpp b/src/libs/engine/events/RequestPortValueEvent.cpp
index 79a7093a..7444068e 100644
--- a/src/libs/engine/events/RequestPortValueEvent.cpp
+++ b/src/libs/engine/events/RequestPortValueEvent.cpp
@@ -15,15 +15,15 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "RequestPortValueEvent.h"
+#include "RequestPortValueEvent.hpp"
 #include <string>
-#include "interface/ClientInterface.h"
-#include "interface/Responder.h"
-#include "Engine.h"
-#include "Port.h"
-#include "ObjectStore.h"
-#include "ClientBroadcaster.h"
-#include "AudioBuffer.h"
+#include "interface/ClientInterface.hpp"
+#include "interface/Responder.hpp"
+#include "Engine.hpp"
+#include "Port.hpp"
+#include "ObjectStore.hpp"
+#include "ClientBroadcaster.hpp"
+#include "AudioBuffer.hpp"
 
 using std::string;
 
diff --git a/src/libs/engine/events/RequestPortValueEvent.h b/src/libs/engine/events/RequestPortValueEvent.hpp
index 87a6373c..1a20b90f 100644
--- a/src/libs/engine/events/RequestPortValueEvent.h
+++ b/src/libs/engine/events/RequestPortValueEvent.hpp
@@ -19,8 +19,8 @@
 #define REQUESTPORTVALUEEVENT_H
 
 #include <string>
-#include "QueuedEvent.h"
-#include "types.h"
+#include "QueuedEvent.hpp"
+#include "types.hpp"
 
 using std::string;
 
diff --git a/src/libs/engine/events/SetMetadataEvent.cpp b/src/libs/engine/events/SetMetadataEvent.cpp
index 6d303915..caa1b449 100644
--- a/src/libs/engine/events/SetMetadataEvent.cpp
+++ b/src/libs/engine/events/SetMetadataEvent.cpp
@@ -15,13 +15,13 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "SetMetadataEvent.h"
+#include "SetMetadataEvent.hpp"
 #include <string>
-#include "interface/Responder.h"
-#include "Engine.h"
-#include "ClientBroadcaster.h"
-#include "GraphObject.h"
-#include "ObjectStore.h"
+#include "interface/Responder.hpp"
+#include "Engine.hpp"
+#include "ClientBroadcaster.hpp"
+#include "GraphObject.hpp"
+#include "ObjectStore.hpp"
 
 using std::string;
 
diff --git a/src/libs/engine/events/SetMetadataEvent.h b/src/libs/engine/events/SetMetadataEvent.hpp
index 63a73a6d..c5476eed 100644
--- a/src/libs/engine/events/SetMetadataEvent.h
+++ b/src/libs/engine/events/SetMetadataEvent.hpp
@@ -19,8 +19,8 @@
 #define SETMETADATAEVENT_H
 
 #include <string>
-#include "QueuedEvent.h"
-#include <raul/Atom.h>
+#include "QueuedEvent.hpp"
+#include <raul/Atom.hpp>
 
 using std::string;
 
diff --git a/src/libs/engine/events/SetPortValueEvent.cpp b/src/libs/engine/events/SetPortValueEvent.cpp
index f78dca7f..5de9dfff 100644
--- a/src/libs/engine/events/SetPortValueEvent.cpp
+++ b/src/libs/engine/events/SetPortValueEvent.cpp
@@ -15,14 +15,14 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "interface/Responder.h"
-#include "SetPortValueEvent.h"
-#include "Engine.h"
-#include "Port.h"
-#include "ClientBroadcaster.h"
-#include "Node.h"
-#include "ObjectStore.h"
-#include "AudioBuffer.h"
+#include "interface/Responder.hpp"
+#include "SetPortValueEvent.hpp"
+#include "Engine.hpp"
+#include "Port.hpp"
+#include "ClientBroadcaster.hpp"
+#include "Node.hpp"
+#include "ObjectStore.hpp"
+#include "AudioBuffer.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/events/SetPortValueEvent.h b/src/libs/engine/events/SetPortValueEvent.hpp
index d5f5735f..2f2f35e7 100644
--- a/src/libs/engine/events/SetPortValueEvent.h
+++ b/src/libs/engine/events/SetPortValueEvent.hpp
@@ -19,8 +19,8 @@
 #define SETPORTVALUEEVENT_H
 
 #include <string>
-#include "Event.h"
-#include "types.h"
+#include "Event.hpp"
+#include "types.hpp"
 using std::string;
 
 namespace Ingen {
diff --git a/src/libs/engine/events/SetPortValueQueuedEvent.cpp b/src/libs/engine/events/SetPortValueQueuedEvent.cpp
index d713ae8a..33178e55 100644
--- a/src/libs/engine/events/SetPortValueQueuedEvent.cpp
+++ b/src/libs/engine/events/SetPortValueQueuedEvent.cpp
@@ -15,15 +15,15 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "SetPortValueQueuedEvent.h"
-#include "interface/Responder.h"
-#include "Engine.h"
-#include "Port.h"
-#include "ClientBroadcaster.h"
-#include "Plugin.h"
-#include "Node.h"
-#include "ObjectStore.h"
-#include "AudioBuffer.h"
+#include "SetPortValueQueuedEvent.hpp"
+#include "interface/Responder.hpp"
+#include "Engine.hpp"
+#include "Port.hpp"
+#include "ClientBroadcaster.hpp"
+#include "Plugin.hpp"
+#include "Node.hpp"
+#include "ObjectStore.hpp"
+#include "AudioBuffer.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/events/SetPortValueQueuedEvent.h b/src/libs/engine/events/SetPortValueQueuedEvent.hpp
index 4cbebe0e..a0e01910 100644
--- a/src/libs/engine/events/SetPortValueQueuedEvent.h
+++ b/src/libs/engine/events/SetPortValueQueuedEvent.hpp
@@ -18,8 +18,8 @@
 #ifndef SETPORTVALUEQUEUEDEVENT_H
 #define SETPORTVALUEQUEUEDEVENT_H
 
-#include "QueuedEvent.h"
-#include "types.h"
+#include "QueuedEvent.hpp"
+#include "types.hpp"
 #include <string>
 using std::string;
 
diff --git a/src/libs/engine/events/UnregisterClientEvent.cpp b/src/libs/engine/events/UnregisterClientEvent.cpp
index 4248fdcb..be03f151 100644
--- a/src/libs/engine/events/UnregisterClientEvent.cpp
+++ b/src/libs/engine/events/UnregisterClientEvent.cpp
@@ -15,11 +15,11 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "interface/ClientInterface.h"
-#include "interface/Responder.h"
-#include "UnregisterClientEvent.h"
-#include "Engine.h"
-#include "ClientBroadcaster.h"
+#include "interface/ClientInterface.hpp"
+#include "interface/Responder.hpp"
+#include "UnregisterClientEvent.hpp"
+#include "Engine.hpp"
+#include "ClientBroadcaster.hpp"
 
 namespace Ingen {
 
diff --git a/src/libs/engine/events/UnregisterClientEvent.h b/src/libs/engine/events/UnregisterClientEvent.hpp
index 159bd160..17d85b93 100644
--- a/src/libs/engine/events/UnregisterClientEvent.h
+++ b/src/libs/engine/events/UnregisterClientEvent.hpp
@@ -18,8 +18,8 @@
 #ifndef UNREGISTERCLIENTEVENT_H
 #define UNREGISTERCLIENTEVENT_H
 
-#include "QueuedEvent.h"
-#include "interface/ClientKey.h"
+#include "QueuedEvent.hpp"
+#include "interface/ClientKey.hpp"
 #include <string>
 using std::string;
 
diff --git a/src/libs/engine/instantiations.cpp b/src/libs/engine/instantiations.cpp
index f4c81722..6dd80445 100644
--- a/src/libs/engine/instantiations.cpp
+++ b/src/libs/engine/instantiations.cpp
@@ -22,9 +22,9 @@
  * instantiate templates (at least not well/completely).
  */
 
-#include "Tree.h"
-#include "TreeImplementation.h"
-#include "GraphObject.h"
+#include "Tree.hpp"
+#include "TreeImplementation.hpp"
+#include "GraphObject.hpp"
 
 template class Tree<Ingen::GraphObject*>;
 
diff --git a/src/libs/engine/tuning.h b/src/libs/engine/tuning.hpp
index 25aa9eb0..25aa9eb0 100644
--- a/src/libs/engine/tuning.h
+++ b/src/libs/engine/tuning.hpp
diff --git a/src/libs/engine/types.h b/src/libs/engine/types.hpp
index 9aea18e8..d242e61d 100644
--- a/src/libs/engine/types.h
+++ b/src/libs/engine/types.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef TYPES_H
-#define TYPES_H
+#ifndef TYPES_HPP
+#define TYPES_HPP
 
 #include <cstddef> // for NULL, size_t, etc
 #include <jack/jack.h>
@@ -30,4 +30,4 @@ typedef jack_nframes_t              SampleCount;
 typedef jack_nframes_t              SampleRate;
 typedef jack_nframes_t              FrameTime;
 
-#endif // TYPES_H
+#endif // TYPES_HPP
diff --git a/src/libs/engine/util.h b/src/libs/engine/util.hpp
index ce943673..ce943673 100644
--- a/src/libs/engine/util.h
+++ b/src/libs/engine/util.hpp
diff --git a/src/libs/gui/App.cpp b/src/libs/gui/App.cpp
index 7b815db2..acebf04e 100644
--- a/src/libs/gui/App.cpp
+++ b/src/libs/gui/App.cpp
@@ -16,33 +16,33 @@
  */
 
 #include "../../../config/config.h"
-#include "App.h"
+#include "App.hpp"
 #include <cassert>
 #include <string>
 #include <fstream>
 #include <libgnomecanvasmm.h>
 #include <time.h>
 #include <sys/time.h>
-#include <raul/Path.h>
-#include "interface/EngineInterface.h"
-#include "client/ObjectModel.h"
-#include "client/PatchModel.h"
-#include "client/Store.h"
-#include "NodeModule.h"
-#include "ControlPanel.h"
-#include "SubpatchModule.h"
-#include "LoadPluginWindow.h"
-#include "PatchWindow.h"
-#include "MessagesWindow.h"
-#include "ConfigWindow.h"
-#include "GladeFactory.h"
-#include "PatchTreeWindow.h"
-#include "Configuration.h"
-#include "ConnectWindow.h"
-#include "ThreadedLoader.h"
-#include "WindowFactory.h"
+#include <raul/Path.hpp>
+#include "interface/EngineInterface.hpp"
+#include "client/ObjectModel.hpp"
+#include "client/PatchModel.hpp"
+#include "client/Store.hpp"
+#include "NodeModule.hpp"
+#include "ControlPanel.hpp"
+#include "SubpatchModule.hpp"
+#include "LoadPluginWindow.hpp"
+#include "PatchWindow.hpp"
+#include "MessagesWindow.hpp"
+#include "ConfigWindow.hpp"
+#include "GladeFactory.hpp"
+#include "PatchTreeWindow.hpp"
+#include "Configuration.hpp"
+#include "ConnectWindow.hpp"
+#include "ThreadedLoader.hpp"
+#include "WindowFactory.hpp"
 /*#ifdef HAVE_LASH
-#include "LashController.h"
+#include "LashController.hpp"
 #endif*/
 using std::cerr; using std::cout; using std::endl;
 using std::string;
diff --git a/src/libs/gui/App.h b/src/libs/gui/App.hpp
index 9173a786..97bbb661 100644
--- a/src/libs/gui/App.h
+++ b/src/libs/gui/App.hpp
@@ -26,8 +26,8 @@
 #include <libgnomecanvasmm.h>
 #include <gtkmm.h>
 #include <libglademm.h>
-#include <raul/RDFWorld.h>
-#include <raul/SharedPtr.h>
+#include <raul/RDFWorld.hpp>
+#include <raul/SharedPtr.hpp>
 using std::string; using std::map; using std::list;
 using std::cerr; using std::endl;
 
diff --git a/src/libs/gui/BreadCrumb.h b/src/libs/gui/BreadCrumb.hpp
index 96464b50..7f4f9f89 100644
--- a/src/libs/gui/BreadCrumb.h
+++ b/src/libs/gui/BreadCrumb.hpp
@@ -19,9 +19,9 @@
 #define BREADCRUMB_H
 
 #include <gtkmm.h>
-#include <raul/Path.h>
-#include <raul/SharedPtr.h>
-#include "PatchView.h"
+#include <raul/Path.hpp>
+#include <raul/SharedPtr.hpp>
+#include "PatchView.hpp"
 
 namespace Ingen {
 namespace GUI {
diff --git a/src/libs/gui/BreadCrumbBox.cpp b/src/libs/gui/BreadCrumbBox.cpp
index 79a0bf69..d8ff4519 100644
--- a/src/libs/gui/BreadCrumbBox.cpp
+++ b/src/libs/gui/BreadCrumbBox.cpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "BreadCrumbBox.h"
-#include "BreadCrumb.h"
+#include "BreadCrumbBox.hpp"
+#include "BreadCrumb.hpp"
 namespace Ingen {
 namespace GUI {
 
diff --git a/src/libs/gui/BreadCrumbBox.h b/src/libs/gui/BreadCrumbBox.hpp
index 8b806f5a..5e90806b 100644
--- a/src/libs/gui/BreadCrumbBox.h
+++ b/src/libs/gui/BreadCrumbBox.hpp
@@ -22,9 +22,9 @@
 #include <gtkmm.h>
 #include <libglademm/xml.h>
 #include <libglademm.h>
-#include <raul/Path.h>
-#include <raul/SharedPtr.h>
-#include "PatchView.h"
+#include <raul/Path.hpp>
+#include <raul/SharedPtr.hpp>
+#include "PatchView.hpp"
 
 namespace Ingen {
 namespace GUI {
diff --git a/src/libs/gui/ConfigWindow.cpp b/src/libs/gui/ConfigWindow.cpp
index c8b29f1a..3fb44626 100644
--- a/src/libs/gui/ConfigWindow.cpp
+++ b/src/libs/gui/ConfigWindow.cpp
@@ -19,8 +19,8 @@
 #include <cassert>
 #include <algorithm>
 #include <cctype>
-#include "client/NodeModel.h"
-#include "ConfigWindow.h"
+#include "client/NodeModel.hpp"
+#include "ConfigWindow.hpp"
 
 using namespace std;
 
diff --git a/src/libs/gui/ConfigWindow.h b/src/libs/gui/ConfigWindow.hpp
index d1a2cff6..dce40218 100644
--- a/src/libs/gui/ConfigWindow.h
+++ b/src/libs/gui/ConfigWindow.hpp
@@ -22,8 +22,8 @@
 #include <libglademm/xml.h>
 #include <libglademm.h>
 #include <gtkmm.h>
-#include "client/PluginModel.h"
-#include "Configuration.h"
+#include "client/PluginModel.hpp"
+#include "Configuration.hpp"
 
 using std::list;
 using Ingen::Client::PluginModel;
diff --git a/src/libs/gui/Configuration.cpp b/src/libs/gui/Configuration.cpp
index 72ea5cb5..afeba77e 100644
--- a/src/libs/gui/Configuration.cpp
+++ b/src/libs/gui/Configuration.cpp
@@ -15,17 +15,17 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "Configuration.h"
+#include "Configuration.hpp"
 #include <cstdlib>
 #include <cassert>
 #include <iostream>
 #include <fstream>
 #include <map>
-#include "client/PortModel.h"
-#include "client/PluginModel.h"
-#include "client/PatchModel.h"
-#include "serialisation/Loader.h"
-#include "App.h"
+#include "client/PortModel.hpp"
+#include "client/PluginModel.hpp"
+#include "client/PatchModel.hpp"
+#include "serialisation/Loader.hpp"
+#include "App.hpp"
 
 using std::cerr; using std::cout; using std::endl;
 using std::map; using std::string;
diff --git a/src/libs/gui/Configuration.h b/src/libs/gui/Configuration.hpp
index 9f7cbb08..9f7cbb08 100644
--- a/src/libs/gui/Configuration.h
+++ b/src/libs/gui/Configuration.hpp
diff --git a/src/libs/gui/ConnectWindow.cpp b/src/libs/gui/ConnectWindow.cpp
index ae787c99..f643b059 100644
--- a/src/libs/gui/ConnectWindow.cpp
+++ b/src/libs/gui/ConnectWindow.cpp
@@ -21,23 +21,23 @@
 #include <stdlib.h>
 #include <sys/time.h>
 #include <sys/resource.h>
-#include <raul/Process.h>
+#include <raul/Process.hpp>
 #include "../../../../config/config.h"
-#include "interface/ClientKey.h"
-#include "interface/EngineInterface.h"
-#include "engine/tuning.h"
-#include "engine/Engine.h"
-#include "engine/DirectResponder.h"
-#include "engine/QueuedEngineInterface.h"
-#include "client/OSCClientReceiver.h"
-#include "client/OSCEngineSender.h"
-#include "client/ThreadedSigClientInterface.h"
-#include "client/Store.h"
-#include "client/PatchModel.h"
-#include "module/Module.h"
-#include "App.h"
-#include "WindowFactory.h"
-#include "ConnectWindow.h"
+#include "interface/ClientKey.hpp"
+#include "interface/EngineInterface.hpp"
+#include "engine/tuning.hpp"
+#include "engine/Engine.hpp"
+#include "engine/DirectResponder.hpp"
+#include "engine/QueuedEngineInterface.hpp"
+#include "client/OSCClientReceiver.hpp"
+#include "client/OSCEngineSender.hpp"
+#include "client/ThreadedSigClientInterface.hpp"
+#include "client/Store.hpp"
+#include "client/PatchModel.hpp"
+#include "module/Module.hpp"
+#include "App.hpp"
+#include "WindowFactory.hpp"
+#include "ConnectWindow.hpp"
 using Ingen::QueuedEngineInterface;
 using Ingen::Client::ThreadedSigClientInterface;
 
diff --git a/src/libs/gui/ConnectWindow.h b/src/libs/gui/ConnectWindow.hpp
index a52bbea2..5a0e67ad 100644
--- a/src/libs/gui/ConnectWindow.h
+++ b/src/libs/gui/ConnectWindow.hpp
@@ -21,8 +21,8 @@
 #include <gtkmm.h>
 #include <libglademm/xml.h>
 #include <libglademm.h>
-#include <raul/SharedPtr.h>
-#include "client/ThreadedSigClientInterface.h"
+#include <raul/SharedPtr.hpp>
+#include "client/ThreadedSigClientInterface.hpp"
 using Ingen::Client::SigClientInterface;
 
 namespace Ingen { class Engine; class QueuedEngineInterface; }
diff --git a/src/libs/gui/Connection.h b/src/libs/gui/Connection.hpp
index 75c988ac..b6ad070c 100644
--- a/src/libs/gui/Connection.h
+++ b/src/libs/gui/Connection.hpp
@@ -20,9 +20,9 @@
 
 #include <cassert>
 #include <string>
-#include <flowcanvas/Connection.h>
-#include <raul/SharedPtr.h>
-#include "client/ConnectionModel.h"
+#include <flowcanvas/Connection.hpp>
+#include <raul/SharedPtr.hpp>
+#include "client/ConnectionModel.hpp"
 using Ingen::Client::ConnectionModel;
 
 namespace Ingen {
diff --git a/src/libs/gui/ControlGroups.cpp b/src/libs/gui/ControlGroups.cpp
index 5098c3f8..d410f201 100644
--- a/src/libs/gui/ControlGroups.cpp
+++ b/src/libs/gui/ControlGroups.cpp
@@ -18,15 +18,15 @@
 #include <cmath>
 #include <iostream>
 #include <algorithm>
-#include "interface/EngineInterface.h"
-#include "client/PluginModel.h"
-#include "client/NodeModel.h"
-#include "client/PortModel.h"
-#include "ControlGroups.h"
-#include "ControlPanel.h"
-#include "PortPropertiesWindow.h"
-#include "GladeFactory.h"
-#include "App.h"
+#include "interface/EngineInterface.hpp"
+#include "client/PluginModel.hpp"
+#include "client/NodeModel.hpp"
+#include "client/PortModel.hpp"
+#include "ControlGroups.hpp"
+#include "ControlPanel.hpp"
+#include "PortPropertiesWindow.hpp"
+#include "GladeFactory.hpp"
+#include "App.hpp"
 
 using namespace std;
 using namespace Ingen::Client;
diff --git a/src/libs/gui/ControlGroups.h b/src/libs/gui/ControlGroups.hpp
index 4c5c6f11..232b1b56 100644
--- a/src/libs/gui/ControlGroups.h
+++ b/src/libs/gui/ControlGroups.hpp
@@ -22,8 +22,8 @@
 #include <gtkmm.h>
 #include <libglademm/xml.h>
 #include <libglademm.h>
-#include "client/PortModel.h"
-#include <raul/SharedPtr.h>
+#include "client/PortModel.hpp"
+#include <raul/SharedPtr.hpp>
 
 namespace Ingen { namespace Client { class PortModel; } }
 using namespace Ingen::Client;
diff --git a/src/libs/gui/ControlPanel.cpp b/src/libs/gui/ControlPanel.cpp
index 70ab273e..0fb3dfb8 100644
--- a/src/libs/gui/ControlPanel.cpp
+++ b/src/libs/gui/ControlPanel.cpp
@@ -15,15 +15,15 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "interface/EngineInterface.h"
-#include "client/PatchModel.h"
-#include "client/NodeModel.h"
-#include "client/PortModel.h"
-#include "client/PluginModel.h"
-#include "App.h"
-#include "ControlPanel.h"
-#include "ControlGroups.h"
-#include "GladeFactory.h"
+#include "interface/EngineInterface.hpp"
+#include "client/PatchModel.hpp"
+#include "client/NodeModel.hpp"
+#include "client/PortModel.hpp"
+#include "client/PluginModel.hpp"
+#include "App.hpp"
+#include "ControlPanel.hpp"
+#include "ControlGroups.hpp"
+#include "GladeFactory.hpp"
 
 namespace Ingen {
 namespace GUI {
diff --git a/src/libs/gui/ControlPanel.h b/src/libs/gui/ControlPanel.hpp
index 230b9b65..70ae4e95 100644
--- a/src/libs/gui/ControlPanel.h
+++ b/src/libs/gui/ControlPanel.hpp
@@ -26,8 +26,8 @@
 #include <gtkmm.h>
 #include <libglademm/xml.h>
 #include <libglademm.h>
-#include <raul/Path.h>
-#include "ControlGroups.h"
+#include <raul/Path.hpp>
+#include "ControlGroups.hpp"
 
 
 using std::vector; using std::string; using std::pair;
diff --git a/src/libs/gui/DSSIController.cpp b/src/libs/gui/DSSIController.cpp
index f245d61f..b5537f82 100644
--- a/src/libs/gui/DSSIController.cpp
+++ b/src/libs/gui/DSSIController.cpp
@@ -15,16 +15,16 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "DSSIController.h"
+#include "DSSIController.hpp"
 #include <iomanip>
 #include <sstream>
 #include <dirent.h>
 #include <unistd.h>
 #include <sys/stat.h>
-#include "interface/EngineInterface.h"
-#include "client/NodeModel.h"
-#include "App.h"
-#include "DSSIModule.h"
+#include "interface/EngineInterface.hpp"
+#include "client/NodeModel.hpp"
+#include "App.hpp"
+#include "DSSIModule.hpp"
 
 namespace Ingen {
 namespace GUI {
diff --git a/src/libs/gui/DSSIController.h b/src/libs/gui/DSSIController.hpp
index fdb0c1c0..0d7073ea 100644
--- a/src/libs/gui/DSSIController.h
+++ b/src/libs/gui/DSSIController.hpp
@@ -20,8 +20,8 @@
 
 #include <string>
 #include <gtkmm.h>
-#include <raul/Path.h>
-#include "client/NodeModel.h"
+#include <raul/Path.hpp>
+#include "client/NodeModel.hpp"
 
 using std::string;
 using namespace Ingen::Client;
diff --git a/src/libs/gui/DSSIModule.cpp b/src/libs/gui/DSSIModule.cpp
index 57cbd03f..84058100 100644
--- a/src/libs/gui/DSSIModule.cpp
+++ b/src/libs/gui/DSSIModule.cpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "DSSIModule.h"
-#include "DSSIController.h"
+#include "DSSIModule.hpp"
+#include "DSSIController.hpp"
 
 namespace Ingen {
 namespace GUI {
diff --git a/src/libs/gui/DSSIModule.h b/src/libs/gui/DSSIModule.hpp
index 1c041900..76824bdc 100644
--- a/src/libs/gui/DSSIModule.h
+++ b/src/libs/gui/DSSIModule.hpp
@@ -18,7 +18,7 @@
 #ifndef DSSIMODULE_H
 #define DSSIMODULE_H
 
-#include "NodeModule.h"
+#include "NodeModule.hpp"
 
 namespace Ingen {
 namespace GUI {
diff --git a/src/libs/gui/GladeFactory.cpp b/src/libs/gui/GladeFactory.cpp
index 8b1f1e1f..de23a0b7 100644
--- a/src/libs/gui/GladeFactory.cpp
+++ b/src/libs/gui/GladeFactory.cpp
@@ -15,7 +15,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "GladeFactory.h"
+#include "GladeFactory.hpp"
 #include <iostream>
 #include <fstream>
 using std::cout; using std::cerr; using std::endl;
diff --git a/src/libs/gui/GladeFactory.h b/src/libs/gui/GladeFactory.hpp
index 0a2e88fc..0a2e88fc 100644
--- a/src/libs/gui/GladeFactory.h
+++ b/src/libs/gui/GladeFactory.hpp
diff --git a/src/libs/gui/LashController.cpp b/src/libs/gui/LashController.cpp
index b62ec818..8f288766 100644
--- a/src/libs/gui/LashController.cpp
+++ b/src/libs/gui/LashController.cpp
@@ -15,15 +15,15 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "LashController.h"
-#include "config.h"
+#include "LashController.hpp"
+#include "../../../../config/config.hpp"
 #include <iostream>
 #include <string>
 #include <cassert>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include "App.h"
-#include "PatchModel.h"
+#include "App.hpp"
+#include "PatchModel.hpp"
 
 using std::cerr; using std::cout; using std::endl;
 using std::string;
diff --git a/src/libs/gui/LashController.h b/src/libs/gui/LashController.hpp
index f47eb5e9..f47eb5e9 100644
--- a/src/libs/gui/LashController.h
+++ b/src/libs/gui/LashController.hpp
diff --git a/src/libs/gui/LoadPatchWindow.cpp b/src/libs/gui/LoadPatchWindow.cpp
index faaa519a..d849c256 100644
--- a/src/libs/gui/LoadPatchWindow.cpp
+++ b/src/libs/gui/LoadPatchWindow.cpp
@@ -15,15 +15,15 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "LoadPatchWindow.h"
+#include "LoadPatchWindow.hpp"
 #include <sys/types.h>
 #include <dirent.h>
 #include <boost/optional/optional.hpp>
-#include "interface/EngineInterface.h"
-#include "client/PatchModel.h"
-#include "App.h"
-#include "Configuration.h"
-#include "ThreadedLoader.h"
+#include "interface/EngineInterface.hpp"
+#include "client/PatchModel.hpp"
+#include "App.hpp"
+#include "Configuration.hpp"
+#include "ThreadedLoader.hpp"
 
 using namespace Ingen::Serialisation;
 using boost::optional;
diff --git a/src/libs/gui/LoadPatchWindow.h b/src/libs/gui/LoadPatchWindow.hpp
index 47f0bc8f..3524ce16 100644
--- a/src/libs/gui/LoadPatchWindow.h
+++ b/src/libs/gui/LoadPatchWindow.hpp
@@ -20,9 +20,9 @@
 
 #include <libglademm/xml.h>
 #include <gtkmm.h>
-#include <raul/SharedPtr.h>
-#include "client/PluginModel.h"
-#include "client/PatchModel.h"
+#include <raul/SharedPtr.hpp>
+#include "client/PluginModel.hpp"
+#include "client/PatchModel.hpp"
 using Ingen::Client::PatchModel;
 using Ingen::Client::MetadataMap;
 
diff --git a/src/libs/gui/LoadPluginWindow.cpp b/src/libs/gui/LoadPluginWindow.cpp
index a4b24e5f..cc7c7e71 100644
--- a/src/libs/gui/LoadPluginWindow.cpp
+++ b/src/libs/gui/LoadPluginWindow.cpp
@@ -19,15 +19,15 @@
 #include <cassert>
 #include <algorithm>
 #include <cctype>
-#include "interface/EngineInterface.h"
-#include "client/NodeModel.h"
-#include "client/PatchModel.h"
-#include "client/Store.h"
-#include "App.h"
-#include "LoadPluginWindow.h"
-#include "PatchWindow.h"
-#include "PatchView.h"
-#include "PatchCanvas.h"
+#include "interface/EngineInterface.hpp"
+#include "client/NodeModel.hpp"
+#include "client/PatchModel.hpp"
+#include "client/Store.hpp"
+#include "App.hpp"
+#include "LoadPluginWindow.hpp"
+#include "PatchWindow.hpp"
+#include "PatchView.hpp"
+#include "PatchCanvas.hpp"
 using std::cout; using std::cerr; using std::endl;
 
 
diff --git a/src/libs/gui/LoadPluginWindow.h b/src/libs/gui/LoadPluginWindow.hpp
index 1b39d314..ce8a331b 100644
--- a/src/libs/gui/LoadPluginWindow.h
+++ b/src/libs/gui/LoadPluginWindow.hpp
@@ -23,9 +23,9 @@
 #include <libglademm/xml.h>
 #include <libglademm.h>
 #include <gtkmm.h>
-#include <raul/SharedPtr.h>
-#include "client/PatchModel.h"
-#include "client/PluginModel.h"
+#include <raul/SharedPtr.hpp>
+#include "client/PatchModel.hpp"
+#include "client/PluginModel.hpp"
 using Ingen::Client::PluginModel;
 using Ingen::Client::PatchModel;
 using Ingen::Client::MetadataMap;
diff --git a/src/libs/gui/LoadRemotePatchWindow.cpp b/src/libs/gui/LoadRemotePatchWindow.cpp
index 534a6949..096f6d61 100644
--- a/src/libs/gui/LoadRemotePatchWindow.cpp
+++ b/src/libs/gui/LoadRemotePatchWindow.cpp
@@ -15,16 +15,16 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "LoadRemotePatchWindow.h"
+#include "LoadRemotePatchWindow.hpp"
 #include <sys/types.h>
 #include <dirent.h>
 #include <boost/optional/optional.hpp>
-#include <raul/RDFQuery.h>
-#include "interface/EngineInterface.h"
-#include "client/PatchModel.h"
-#include "App.h"
-#include "Configuration.h"
-#include "ThreadedLoader.h"
+#include <raul/RDFQuery.hpp>
+#include "interface/EngineInterface.hpp"
+#include "client/PatchModel.hpp"
+#include "App.hpp"
+#include "Configuration.hpp"
+#include "ThreadedLoader.hpp"
 
 using boost::optional;
 using namespace Raul;
diff --git a/src/libs/gui/LoadRemotePatchWindow.h b/src/libs/gui/LoadRemotePatchWindow.hpp
index bbb3d93e..2afef975 100644
--- a/src/libs/gui/LoadRemotePatchWindow.h
+++ b/src/libs/gui/LoadRemotePatchWindow.hpp
@@ -20,9 +20,9 @@
 
 #include <libglademm/xml.h>
 #include <gtkmm.h>
-#include <raul/SharedPtr.h>
-#include "client/PatchModel.h"
-#include "client/PluginModel.h"
+#include <raul/SharedPtr.hpp>
+#include "client/PatchModel.hpp"
+#include "client/PluginModel.hpp"
 using Ingen::Client::PatchModel;
 using Ingen::Client::MetadataMap;
 
diff --git a/src/libs/gui/LoadSubpatchWindow.cpp b/src/libs/gui/LoadSubpatchWindow.cpp
index 57fa9adc..a2591b86 100644
--- a/src/libs/gui/LoadSubpatchWindow.cpp
+++ b/src/libs/gui/LoadSubpatchWindow.cpp
@@ -19,14 +19,14 @@
 #include <dirent.h>
 #include <cassert>
 #include <boost/optional.hpp>
-#include "interface/EngineInterface.h"
-#include "client/NodeModel.h"
-#include "client/PatchModel.h"
-#include "App.h"
-#include "LoadSubpatchWindow.h"
-#include "PatchView.h"
-#include "Configuration.h"
-#include "ThreadedLoader.h"
+#include "interface/EngineInterface.hpp"
+#include "client/NodeModel.hpp"
+#include "client/PatchModel.hpp"
+#include "App.hpp"
+#include "LoadSubpatchWindow.hpp"
+#include "PatchView.hpp"
+#include "Configuration.hpp"
+#include "ThreadedLoader.hpp"
 using boost::optional;
 
 namespace Ingen {
diff --git a/src/libs/gui/LoadSubpatchWindow.h b/src/libs/gui/LoadSubpatchWindow.hpp
index 08a6f7db..01047a3e 100644
--- a/src/libs/gui/LoadSubpatchWindow.h
+++ b/src/libs/gui/LoadSubpatchWindow.hpp
@@ -20,9 +20,9 @@
 
 #include <libglademm/xml.h>
 #include <gtkmm.h>
-#include <raul/SharedPtr.h>
-#include "client/PatchModel.h"
-#include "client/PluginModel.h"
+#include <raul/SharedPtr.hpp>
+#include "client/PatchModel.hpp"
+#include "client/PluginModel.hpp"
 using Ingen::Client::PatchModel;
 using Ingen::Client::MetadataMap;
 
diff --git a/src/libs/gui/MessagesWindow.cpp b/src/libs/gui/MessagesWindow.cpp
index b8a83c20..3da810f6 100644
--- a/src/libs/gui/MessagesWindow.cpp
+++ b/src/libs/gui/MessagesWindow.cpp
@@ -15,7 +15,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "MessagesWindow.h"
+#include "MessagesWindow.hpp"
 #include <string>
 
 namespace Ingen {
diff --git a/src/libs/gui/MessagesWindow.h b/src/libs/gui/MessagesWindow.hpp
index dea0fdd4..dea0fdd4 100644
--- a/src/libs/gui/MessagesWindow.h
+++ b/src/libs/gui/MessagesWindow.hpp
diff --git a/src/libs/gui/NewSubpatchWindow.cpp b/src/libs/gui/NewSubpatchWindow.cpp
index f0bc7caa..8b66b6c2 100644
--- a/src/libs/gui/NewSubpatchWindow.cpp
+++ b/src/libs/gui/NewSubpatchWindow.cpp
@@ -15,12 +15,12 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "App.h"
-#include "interface/EngineInterface.h"
-#include "client/NodeModel.h"
-#include "client/PatchModel.h"
-#include "NewSubpatchWindow.h"
-#include "PatchView.h"
+#include "App.hpp"
+#include "interface/EngineInterface.hpp"
+#include "client/NodeModel.hpp"
+#include "client/PatchModel.hpp"
+#include "NewSubpatchWindow.hpp"
+#include "PatchView.hpp"
 
 namespace Ingen {
 namespace GUI {
diff --git a/src/libs/gui/NewSubpatchWindow.h b/src/libs/gui/NewSubpatchWindow.hpp
index e70b7f91..d6ce65d7 100644
--- a/src/libs/gui/NewSubpatchWindow.h
+++ b/src/libs/gui/NewSubpatchWindow.hpp
@@ -20,9 +20,9 @@
 
 #include <libglademm/xml.h>
 #include <gtkmm.h>
-#include <raul/SharedPtr.h>
-#include "client/PatchModel.h"
-#include "client/PluginModel.h"
+#include <raul/SharedPtr.hpp>
+#include "client/PatchModel.hpp"
+#include "client/PluginModel.hpp"
 using Ingen::Client::PatchModel;
 using Ingen::Client::MetadataMap;
 
diff --git a/src/libs/gui/NodeControlWindow.cpp b/src/libs/gui/NodeControlWindow.cpp
index 26108833..e5f25a1e 100644
--- a/src/libs/gui/NodeControlWindow.cpp
+++ b/src/libs/gui/NodeControlWindow.cpp
@@ -17,14 +17,14 @@
 
 #include <iostream>
 #include <cmath>
-#include "interface/EngineInterface.h"
-#include "client/NodeModel.h"
-#include "App.h"
-#include "NodeControlWindow.h"
-#include "GladeFactory.h"
-#include "ControlGroups.h"
-#include "ControlPanel.h"
-#include "PatchWindow.h"
+#include "interface/EngineInterface.hpp"
+#include "client/NodeModel.hpp"
+#include "App.hpp"
+#include "NodeControlWindow.hpp"
+#include "GladeFactory.hpp"
+#include "ControlGroups.hpp"
+#include "ControlPanel.hpp"
+#include "PatchWindow.hpp"
 
 using namespace std;
 
diff --git a/src/libs/gui/NodeControlWindow.h b/src/libs/gui/NodeControlWindow.hpp
index bd6f9fc9..b639474a 100644
--- a/src/libs/gui/NodeControlWindow.h
+++ b/src/libs/gui/NodeControlWindow.hpp
@@ -23,7 +23,7 @@
 #include <gtkmm.h>
 #include <libglademm.h>
 #include <sigc++/sigc++.h>
-#include <raul/SharedPtr.h>
+#include <raul/SharedPtr.hpp>
 using std::string; using std::vector;
 
 namespace Ingen { namespace Client {
diff --git a/src/libs/gui/NodeMenu.cpp b/src/libs/gui/NodeMenu.cpp
index cf71989c..f65eb512 100644
--- a/src/libs/gui/NodeMenu.cpp
+++ b/src/libs/gui/NodeMenu.cpp
@@ -17,11 +17,11 @@
 
 #include <iostream>
 #include <gtkmm.h>
-#include "interface/EngineInterface.h"
-#include "client/NodeModel.h"
-#include "App.h"
-#include "NodeMenu.h"
-#include "WindowFactory.h"
+#include "interface/EngineInterface.hpp"
+#include "client/NodeModel.hpp"
+#include "App.hpp"
+#include "NodeMenu.hpp"
+#include "WindowFactory.hpp"
 
 using std::cerr; using std::endl;
 
diff --git a/src/libs/gui/NodeMenu.h b/src/libs/gui/NodeMenu.hpp
index 65044608..0290d861 100644
--- a/src/libs/gui/NodeMenu.h
+++ b/src/libs/gui/NodeMenu.hpp
@@ -20,9 +20,9 @@
 
 #include <string>
 #include <gtkmm.h>
-#include <raul/Path.h>
-#include <raul/SharedPtr.h>
-#include "client/NodeModel.h"
+#include <raul/Path.hpp>
+#include <raul/SharedPtr.hpp>
+#include "client/NodeModel.hpp"
 using Ingen::Client::NodeModel;
 
 using std::string;
diff --git a/src/libs/gui/NodeModule.cpp b/src/libs/gui/NodeModule.cpp
index 61c937a8..b7126dd7 100644
--- a/src/libs/gui/NodeModule.cpp
+++ b/src/libs/gui/NodeModule.cpp
@@ -16,20 +16,20 @@
  */
 
 #include <cassert>
-#include <raul/Atom.h>
-#include "interface/EngineInterface.h"
-#include "client/PatchModel.h"
-#include "client/NodeModel.h"
-#include "App.h"
-#include "NodeModule.h"
-#include "PatchCanvas.h"
-#include "Port.h"
-#include "GladeFactory.h"
-#include "RenameWindow.h"
-#include "PatchWindow.h"
-#include "WindowFactory.h"
-#include "SubpatchModule.h"
-#include "NodeControlWindow.h"
+#include <raul/Atom.hpp>
+#include "interface/EngineInterface.hpp"
+#include "client/PatchModel.hpp"
+#include "client/NodeModel.hpp"
+#include "App.hpp"
+#include "NodeModule.hpp"
+#include "PatchCanvas.hpp"
+#include "Port.hpp"
+#include "GladeFactory.hpp"
+#include "RenameWindow.hpp"
+#include "PatchWindow.hpp"
+#include "WindowFactory.hpp"
+#include "SubpatchModule.hpp"
+#include "NodeControlWindow.hpp"
 
 namespace Ingen {
 namespace GUI {
diff --git a/src/libs/gui/NodeModule.h b/src/libs/gui/NodeModule.hpp
index 66a46503..b68d1143 100644
--- a/src/libs/gui/NodeModule.h
+++ b/src/libs/gui/NodeModule.hpp
@@ -19,10 +19,10 @@
 
 #include <string>
 #include <libgnomecanvasmm.h>
-#include <flowcanvas/Module.h>
-#include <raul/SharedPtr.h>
-#include "Port.h"
-#include "NodeMenu.h"
+#include <flowcanvas/Module.hpp>
+#include <raul/SharedPtr.hpp>
+#include "Port.hpp"
+#include "NodeMenu.hpp"
 using std::string;
 
 class Atom;
diff --git a/src/libs/gui/NodePropertiesWindow.cpp b/src/libs/gui/NodePropertiesWindow.cpp
index 0cd59e80..a6fb46ee 100644
--- a/src/libs/gui/NodePropertiesWindow.cpp
+++ b/src/libs/gui/NodePropertiesWindow.cpp
@@ -17,9 +17,9 @@
 
 #include <cassert>
 #include <string>
-#include "client/NodeModel.h"
-#include "client/PluginModel.h"
-#include "NodePropertiesWindow.h"
+#include "client/NodeModel.hpp"
+#include "client/PluginModel.hpp"
+#include "NodePropertiesWindow.hpp"
 
 namespace Ingen {
 namespace GUI {
diff --git a/src/libs/gui/NodePropertiesWindow.h b/src/libs/gui/NodePropertiesWindow.hpp
index 057de4ec..248c8b42 100644
--- a/src/libs/gui/NodePropertiesWindow.h
+++ b/src/libs/gui/NodePropertiesWindow.hpp
@@ -20,8 +20,8 @@
 
 #include <gtkmm.h>
 #include <libglademm.h>
-#include <raul/SharedPtr.h>
-#include "client/NodeModel.h"
+#include <raul/SharedPtr.hpp>
+#include "client/NodeModel.hpp"
 using namespace Ingen::Client;
 
 namespace Ingen {
diff --git a/src/libs/gui/PatchCanvas.cpp b/src/libs/gui/PatchCanvas.cpp
index d08b7b86..ba7a58ce 100644
--- a/src/libs/gui/PatchCanvas.cpp
+++ b/src/libs/gui/PatchCanvas.cpp
@@ -15,28 +15,29 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "../../../../config/config.h"
+
 #include <cassert>
-#include <flowcanvas/Canvas.h>
-#include "interface/EngineInterface.h"
-#include "client/PluginModel.h"
-#include "client/PatchModel.h"
-#include "client/NodeModel.h"
-#include "client/Store.h"
-#include "client/Serializer.h"
-#include "App.h"
-#include "PatchCanvas.h"
-#include "PatchWindow.h"
-#include "PatchPortModule.h"
-#include "LoadPluginWindow.h"
-#include "LoadSubpatchWindow.h"
-#include "NewSubpatchWindow.h"
-#include "Port.h"
-#include "Connection.h"
-#include "NodeModule.h"
-#include "SubpatchModule.h"
-#include "GladeFactory.h"
-#include "WindowFactory.h"
-#include "config.h"
+#include <flowcanvas/Canvas.hpp>
+#include "interface/EngineInterface.hpp"
+#include "client/PluginModel.hpp"
+#include "client/PatchModel.hpp"
+#include "client/NodeModel.hpp"
+#include "client/Store.hpp"
+#include "client/Serializer.hpp"
+#include "App.hpp"
+#include "PatchCanvas.hpp"
+#include "PatchWindow.hpp"
+#include "PatchPortModule.hpp"
+#include "LoadPluginWindow.hpp"
+#include "LoadSubpatchWindow.hpp"
+#include "NewSubpatchWindow.hpp"
+#include "Port.hpp"
+#include "Connection.hpp"
+#include "NodeModule.hpp"
+#include "SubpatchModule.hpp"
+#include "GladeFactory.hpp"
+#include "WindowFactory.hpp"
 using Ingen::Client::Store;
 using Ingen::Client::Serializer;
 using Ingen::Client::PluginModel;
diff --git a/src/libs/gui/PatchCanvas.h b/src/libs/gui/PatchCanvas.hpp
index 1cf9f410..06126334 100644
--- a/src/libs/gui/PatchCanvas.h
+++ b/src/libs/gui/PatchCanvas.hpp
@@ -21,13 +21,13 @@
 #include <string>
 #include <map>
 #include <boost/shared_ptr.hpp>
-#include <flowcanvas/Canvas.h>
-#include <flowcanvas/Module.h>
-#include <raul/SharedPtr.h>
-#include <raul/Path.h>
-#include "client/ConnectionModel.h"
-#include "client/PatchModel.h"
-#include "NodeModule.h"
+#include <flowcanvas/Canvas.hpp>
+#include <flowcanvas/Module.hpp>
+#include <raul/SharedPtr.hpp>
+#include <raul/Path.hpp>
+#include "client/ConnectionModel.hpp"
+#include "client/PatchModel.hpp"
+#include "NodeModule.hpp"
 
 using std::string;
 using namespace FlowCanvas;
diff --git a/src/libs/gui/PatchPortModule.cpp b/src/libs/gui/PatchPortModule.cpp
index 6f309324..1d566741 100644
--- a/src/libs/gui/PatchPortModule.cpp
+++ b/src/libs/gui/PatchPortModule.cpp
@@ -15,17 +15,17 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "PatchPortModule.h"
+#include "PatchPortModule.hpp"
 #include <cassert>
-#include "interface/EngineInterface.h"
-#include "client/PatchModel.h"
-#include "client/NodeModel.h"
-#include "App.h"
-#include "PatchCanvas.h"
-#include "Port.h"
-#include "GladeFactory.h"
-#include "RenameWindow.h"
-#include "PatchWindow.h"
+#include "interface/EngineInterface.hpp"
+#include "client/PatchModel.hpp"
+#include "client/NodeModel.hpp"
+#include "App.hpp"
+#include "PatchCanvas.hpp"
+#include "Port.hpp"
+#include "GladeFactory.hpp"
+#include "RenameWindow.hpp"
+#include "PatchWindow.hpp"
 
 namespace Ingen {
 namespace GUI {
diff --git a/src/libs/gui/PatchPortModule.h b/src/libs/gui/PatchPortModule.hpp
index 81bc7b53..ceac4954 100644
--- a/src/libs/gui/PatchPortModule.h
+++ b/src/libs/gui/PatchPortModule.hpp
@@ -21,9 +21,9 @@
 #include <string>
 #include <boost/enable_shared_from_this.hpp>
 #include <libgnomecanvasmm.h>
-#include <flowcanvas/Module.h>
-#include <raul/Atom.h>
-#include "Port.h"
+#include <flowcanvas/Module.hpp>
+#include <raul/Atom.hpp>
+#include "Port.hpp"
 using std::string;
 
 namespace Ingen { namespace Client {
diff --git a/src/libs/gui/PatchPropertiesWindow.cpp b/src/libs/gui/PatchPropertiesWindow.cpp
index 1e310f0b..eb5120c4 100644
--- a/src/libs/gui/PatchPropertiesWindow.cpp
+++ b/src/libs/gui/PatchPropertiesWindow.cpp
@@ -16,8 +16,8 @@
  */
 
 #include <string>
-#include "client/PatchModel.h"
-#include "PatchPropertiesWindow.h"
+#include "client/PatchModel.hpp"
+#include "PatchPropertiesWindow.hpp"
 
 namespace Ingen {
 namespace GUI {
diff --git a/src/libs/gui/PatchPropertiesWindow.h b/src/libs/gui/PatchPropertiesWindow.hpp
index 0640a198..0f60b147 100644
--- a/src/libs/gui/PatchPropertiesWindow.h
+++ b/src/libs/gui/PatchPropertiesWindow.hpp
@@ -21,7 +21,7 @@
 #include <string>
 #include <gtkmm.h>
 #include <libglademm/xml.h>
-#include <raul/SharedPtr.h>
+#include <raul/SharedPtr.hpp>
 using std::string;
 
 namespace Ingen { namespace Client { class PatchModel; } }
diff --git a/src/libs/gui/PatchTreeWindow.cpp b/src/libs/gui/PatchTreeWindow.cpp
index b77508c1..bdd293ac 100644
--- a/src/libs/gui/PatchTreeWindow.cpp
+++ b/src/libs/gui/PatchTreeWindow.cpp
@@ -15,15 +15,15 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <raul/Path.h>
-#include "interface/EngineInterface.h"
-#include "client/OSCEngineSender.h"
-#include "client/Store.h"
-#include "client/PatchModel.h"
-#include "App.h"
-#include "PatchTreeWindow.h"
-#include "SubpatchModule.h"
-#include "WindowFactory.h"
+#include <raul/Path.hpp>
+#include "interface/EngineInterface.hpp"
+#include "client/OSCEngineSender.hpp"
+#include "client/Store.hpp"
+#include "client/PatchModel.hpp"
+#include "App.hpp"
+#include "PatchTreeWindow.hpp"
+#include "SubpatchModule.hpp"
+#include "WindowFactory.hpp"
 
 namespace Ingen {
 namespace GUI {
diff --git a/src/libs/gui/PatchTreeWindow.h b/src/libs/gui/PatchTreeWindow.hpp
index 9868d363..534f4607 100644
--- a/src/libs/gui/PatchTreeWindow.h
+++ b/src/libs/gui/PatchTreeWindow.hpp
@@ -20,7 +20,7 @@
 
 #include <gtkmm.h>
 #include <libglademm.h>
-#include <raul/Path.h>
+#include <raul/Path.hpp>
 
 namespace Ingen { namespace Client {
 	class Store;
diff --git a/src/libs/gui/PatchView.cpp b/src/libs/gui/PatchView.cpp
index fa0d01a0..0246b98c 100644
--- a/src/libs/gui/PatchView.cpp
+++ b/src/libs/gui/PatchView.cpp
@@ -18,18 +18,18 @@
 #include <iostream>
 #include <cassert>
 #include <fstream>
-#include "interface/EngineInterface.h"
-#include "client/PatchModel.h"
-#include "App.h"
-#include "PatchView.h"
-#include "PatchCanvas.h"
-#include "LoadPluginWindow.h"
-#include "NewSubpatchWindow.h"
-#include "LoadSubpatchWindow.h"
-#include "NodeControlWindow.h"
-#include "PatchPropertiesWindow.h"
-#include "PatchTreeWindow.h"
-#include "GladeFactory.h"
+#include "interface/EngineInterface.hpp"
+#include "client/PatchModel.hpp"
+#include "App.hpp"
+#include "PatchView.hpp"
+#include "PatchCanvas.hpp"
+#include "LoadPluginWindow.hpp"
+#include "NewSubpatchWindow.hpp"
+#include "LoadSubpatchWindow.hpp"
+#include "NodeControlWindow.hpp"
+#include "PatchPropertiesWindow.hpp"
+#include "PatchTreeWindow.hpp"
+#include "GladeFactory.hpp"
 
 namespace Ingen {
 namespace GUI {
diff --git a/src/libs/gui/PatchView.h b/src/libs/gui/PatchView.hpp
index 72d773fa..c3d0fc8a 100644
--- a/src/libs/gui/PatchView.h
+++ b/src/libs/gui/PatchView.hpp
@@ -22,8 +22,8 @@
 #include <gtkmm.h>
 #include <libglademm/xml.h>
 #include <libglademm.h>
-#include <raul/SharedPtr.h>
-#include "client/PatchModel.h"
+#include <raul/SharedPtr.hpp>
+#include "client/PatchModel.hpp"
 
 using std::string;
 
diff --git a/src/libs/gui/PatchWindow.cpp b/src/libs/gui/PatchWindow.cpp
index 048416df..b0b87c5e 100644
--- a/src/libs/gui/PatchWindow.cpp
+++ b/src/libs/gui/PatchWindow.cpp
@@ -15,29 +15,29 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "PatchWindow.h"
+#include "PatchWindow.hpp"
 #include <iostream>
 #include <cassert>
 #include <fstream>
-#include "interface/EngineInterface.h"
-#include "client/PatchModel.h"
-#include "client/Store.h"
-#include "App.h"
-#include "PatchCanvas.h"
-#include "LoadPluginWindow.h"
-#include "NewSubpatchWindow.h"
-#include "LoadPatchWindow.h"
-#include "LoadSubpatchWindow.h"
-#include "NodeControlWindow.h"
-#include "PatchPropertiesWindow.h"
-#include "ConfigWindow.h"
-#include "MessagesWindow.h"
-#include "PatchTreeWindow.h"
-#include "BreadCrumbBox.h"
-#include "ConnectWindow.h"
-#include "ThreadedLoader.h"
-#include "WindowFactory.h"
-#include "PatchView.h"
+#include "interface/EngineInterface.hpp"
+#include "client/PatchModel.hpp"
+#include "client/Store.hpp"
+#include "App.hpp"
+#include "PatchCanvas.hpp"
+#include "LoadPluginWindow.hpp"
+#include "NewSubpatchWindow.hpp"
+#include "LoadPatchWindow.hpp"
+#include "LoadSubpatchWindow.hpp"
+#include "NodeControlWindow.hpp"
+#include "PatchPropertiesWindow.hpp"
+#include "ConfigWindow.hpp"
+#include "MessagesWindow.hpp"
+#include "PatchTreeWindow.hpp"
+#include "BreadCrumbBox.hpp"
+#include "ConnectWindow.hpp"
+#include "ThreadedLoader.hpp"
+#include "WindowFactory.hpp"
+#include "PatchView.hpp"
 
 namespace Ingen {
 namespace GUI {
diff --git a/src/libs/gui/PatchWindow.h b/src/libs/gui/PatchWindow.hpp
index daa4af08..08048bd3 100644
--- a/src/libs/gui/PatchWindow.h
+++ b/src/libs/gui/PatchWindow.hpp
@@ -23,10 +23,10 @@
 #include <gtkmm.h>
 #include <libglademm/xml.h>
 #include <libglademm.h>
-#include <raul/Path.h>
-#include <raul/SharedPtr.h>
-#include "client/PatchModel.h"
-#include "PatchView.h"
+#include <raul/Path.hpp>
+#include <raul/SharedPtr.hpp>
+#include "client/PatchModel.hpp"
+#include "PatchView.hpp"
 using Ingen::Client::PatchModel;
 
 using std::string; using std::list;
diff --git a/src/libs/gui/Port.cpp b/src/libs/gui/Port.cpp
index a03a60d4..4b824f15 100644
--- a/src/libs/gui/Port.cpp
+++ b/src/libs/gui/Port.cpp
@@ -17,13 +17,13 @@
 
 #include <cassert>
 #include <iostream>
-#include "interface/EngineInterface.h"
-#include "client/PatchModel.h"
-#include "client/PortModel.h"
-#include "client/ControlModel.h"
-#include "Configuration.h"
-#include "App.h"
-#include "Port.h"
+#include "interface/EngineInterface.hpp"
+#include "client/PatchModel.hpp"
+#include "client/PortModel.hpp"
+#include "client/ControlModel.hpp"
+#include "Configuration.hpp"
+#include "App.hpp"
+#include "Port.hpp"
 using std::cerr; using std::endl;
 
 using namespace Ingen::Client;
diff --git a/src/libs/gui/Port.h b/src/libs/gui/Port.hpp
index 507ced21..84a1643c 100644
--- a/src/libs/gui/Port.h
+++ b/src/libs/gui/Port.hpp
@@ -20,8 +20,8 @@
 
 #include <cassert>
 #include <string>
-#include <flowcanvas/Port.h>
-#include <raul/SharedPtr.h>
+#include <flowcanvas/Port.hpp>
+#include <raul/SharedPtr.hpp>
 
 namespace Ingen { namespace Client { class PortModel; } }
 using Ingen::Client::PortModel;
diff --git a/src/libs/gui/PortPropertiesWindow.cpp b/src/libs/gui/PortPropertiesWindow.cpp
index 92df6ce5..e3afad5b 100644
--- a/src/libs/gui/PortPropertiesWindow.cpp
+++ b/src/libs/gui/PortPropertiesWindow.cpp
@@ -17,12 +17,12 @@
 
 #include <cassert>
 #include <string>
-#include "interface/EngineInterface.h"
-#include "client/NodeModel.h"
-#include "client/PluginModel.h"
-#include "App.h"
-#include "ControlGroups.h"
-#include "PortPropertiesWindow.h"
+#include "interface/EngineInterface.hpp"
+#include "client/NodeModel.hpp"
+#include "client/PluginModel.hpp"
+#include "App.hpp"
+#include "ControlGroups.hpp"
+#include "PortPropertiesWindow.hpp"
 
 using std::string;
 
diff --git a/src/libs/gui/PortPropertiesWindow.h b/src/libs/gui/PortPropertiesWindow.hpp
index b7900bc6..8c8f1c96 100644
--- a/src/libs/gui/PortPropertiesWindow.h
+++ b/src/libs/gui/PortPropertiesWindow.hpp
@@ -20,8 +20,8 @@
 
 #include <gtkmm.h>
 #include <libglademm.h>
-#include <raul/SharedPtr.h>
-#include "client/PortModel.h"
+#include <raul/SharedPtr.hpp>
+#include "client/PortModel.hpp"
 using namespace Ingen::Client;
 
 namespace Ingen {
diff --git a/src/libs/gui/RenameWindow.cpp b/src/libs/gui/RenameWindow.cpp
index d9c474a8..04ffdd9f 100644
--- a/src/libs/gui/RenameWindow.cpp
+++ b/src/libs/gui/RenameWindow.cpp
@@ -17,11 +17,11 @@
 
 #include <cassert>
 #include <string>
-#include "interface/EngineInterface.h"
-#include "client/ObjectModel.h"
-#include "client/Store.h"
-#include "App.h"
-#include "RenameWindow.h"
+#include "interface/EngineInterface.hpp"
+#include "client/ObjectModel.hpp"
+#include "client/Store.hpp"
+#include "App.hpp"
+#include "RenameWindow.hpp"
 
 using std::string;
 
diff --git a/src/libs/gui/RenameWindow.h b/src/libs/gui/RenameWindow.hpp
index 56ee3d5a..3cf37f7c 100644
--- a/src/libs/gui/RenameWindow.h
+++ b/src/libs/gui/RenameWindow.hpp
@@ -20,8 +20,8 @@
 
 #include <gtkmm.h>
 #include <libglademm.h>
-#include <raul/SharedPtr.h>
-#include "client/ObjectModel.h"
+#include <raul/SharedPtr.hpp>
+#include "client/ObjectModel.hpp"
 using Ingen::Client::ObjectModel;
 
 namespace Ingen {
diff --git a/src/libs/gui/SubpatchModule.cpp b/src/libs/gui/SubpatchModule.cpp
index 475774bc..b2a4d43f 100644
--- a/src/libs/gui/SubpatchModule.cpp
+++ b/src/libs/gui/SubpatchModule.cpp
@@ -15,18 +15,18 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "SubpatchModule.h"
+#include "SubpatchModule.hpp"
 #include <cassert>
 #include <iostream>
-#include "interface/EngineInterface.h"
-#include "client/PatchModel.h"
-#include "App.h"
-#include "NodeModule.h"
-#include "NodeControlWindow.h"
-#include "PatchWindow.h"
-#include "PatchCanvas.h"
-#include "Port.h"
-#include "WindowFactory.h"
+#include "interface/EngineInterface.hpp"
+#include "client/PatchModel.hpp"
+#include "App.hpp"
+#include "NodeModule.hpp"
+#include "NodeControlWindow.hpp"
+#include "PatchWindow.hpp"
+#include "PatchCanvas.hpp"
+#include "Port.hpp"
+#include "WindowFactory.hpp"
 using std::cerr; using std::cout; using std::endl;
 
 namespace Ingen {
diff --git a/src/libs/gui/SubpatchModule.h b/src/libs/gui/SubpatchModule.hpp
index 4dc17e8b..44e37e62 100644
--- a/src/libs/gui/SubpatchModule.h
+++ b/src/libs/gui/SubpatchModule.hpp
@@ -21,10 +21,10 @@
 
 #include <string>
 #include <libgnomecanvasmm.h>
-#include <raul/SharedPtr.h>
-#include "client/PatchModel.h"
-#include "PatchPortModule.h"
-#include "NodeModule.h"
+#include <raul/SharedPtr.hpp>
+#include "client/PatchModel.hpp"
+#include "PatchPortModule.hpp"
+#include "NodeModule.hpp"
 using std::string; using std::list;
 
 namespace Ingen { namespace Client {
diff --git a/src/libs/gui/ThreadedLoader.cpp b/src/libs/gui/ThreadedLoader.cpp
index 75850a5f..653f18b0 100644
--- a/src/libs/gui/ThreadedLoader.cpp
+++ b/src/libs/gui/ThreadedLoader.cpp
@@ -18,10 +18,10 @@
 #include <fstream>
 #include <cassert>
 #include <string>
-#include "client/PatchModel.h"
-#include "module/Module.h"
-#include "App.h"
-#include "ThreadedLoader.h"
+#include "client/PatchModel.hpp"
+#include "module/Module.hpp"
+#include "App.hpp"
+#include "ThreadedLoader.hpp"
 using std::cout; using std::endl;
 
 namespace Ingen {
diff --git a/src/libs/gui/ThreadedLoader.h b/src/libs/gui/ThreadedLoader.hpp
index 1494a9fb..e8574f6f 100644
--- a/src/libs/gui/ThreadedLoader.h
+++ b/src/libs/gui/ThreadedLoader.hpp
@@ -22,14 +22,14 @@
 #include <list>
 #include <cassert>
 #include <boost/optional/optional.hpp>
-#include <raul/Thread.h>
-#include <raul/Slave.h>
+#include <raul/Thread.hpp>
+#include <raul/Slave.hpp>
 #include <glibmm/thread.h>
-#include "interface/EngineInterface.h"
-#include "client/PatchModel.h"
-#include "client/Serializer.h"
-#include "client/DeprecatedLoader.h"
-#include "serialisation/Loader.h"
+#include "interface/EngineInterface.hpp"
+#include "client/PatchModel.hpp"
+#include "client/Serializer.hpp"
+#include "client/DeprecatedLoader.hpp"
+#include "serialisation/Loader.hpp"
 using std::string;
 using std::list;
 using boost::optional;
diff --git a/src/libs/gui/UploadPatchWindow.cpp b/src/libs/gui/UploadPatchWindow.cpp
index 7def01a0..46be0987 100644
--- a/src/libs/gui/UploadPatchWindow.cpp
+++ b/src/libs/gui/UploadPatchWindow.cpp
@@ -21,14 +21,14 @@
 #include <dirent.h>
 #include <boost/optional/optional.hpp>
 #include <curl/curl.h>
-#include <raul/RDFQuery.h>
-#include "interface/EngineInterface.h"
-#include "client/Serializer.h"
-#include "client/PatchModel.h"
-#include "UploadPatchWindow.h"
-#include "App.h"
-#include "Configuration.h"
-#include "ThreadedLoader.h"
+#include <raul/RDFQuery.hpp>
+#include "interface/EngineInterface.hpp"
+#include "client/Serializer.hpp"
+#include "client/PatchModel.hpp"
+#include "UploadPatchWindow.hpp"
+#include "App.hpp"
+#include "Configuration.hpp"
+#include "ThreadedLoader.hpp"
 
 using boost::optional;
 using namespace Raul;
diff --git a/src/libs/gui/UploadPatchWindow.h b/src/libs/gui/UploadPatchWindow.hpp
index 13272215..c3de55fa 100644
--- a/src/libs/gui/UploadPatchWindow.h
+++ b/src/libs/gui/UploadPatchWindow.hpp
@@ -22,11 +22,11 @@
 #include <libglademm/xml.h>
 #include <gtkmm.h>
 #include <curl/curl.h>
-#include <raul/SharedPtr.h>
-#include <raul/Thread.h>
-#include <raul/AtomicInt.h>
-#include "client/PatchModel.h"
-#include "client/PluginModel.h"
+#include <raul/SharedPtr.hpp>
+#include <raul/Thread.hpp>
+#include <raul/AtomicInt.hpp>
+#include "client/PatchModel.hpp"
+#include "client/PluginModel.hpp"
 using Ingen::Client::PatchModel;
 using Ingen::Client::MetadataMap;
 
diff --git a/src/libs/gui/WindowFactory.cpp b/src/libs/gui/WindowFactory.cpp
index 7c2e3eaa..9f128e8e 100644
--- a/src/libs/gui/WindowFactory.cpp
+++ b/src/libs/gui/WindowFactory.cpp
@@ -15,20 +15,20 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "WindowFactory.h"
-#include "App.h"
-#include "PatchWindow.h"
-#include "GladeFactory.h"
-#include "NodePropertiesWindow.h"
-#include "PatchPropertiesWindow.h"
-#include "NodeControlWindow.h"
-#include "LoadPluginWindow.h"
-#include "LoadPatchWindow.h"
-#include "LoadRemotePatchWindow.h"
-#include "UploadPatchWindow.h"
-#include "LoadSubpatchWindow.h"
-#include "RenameWindow.h"
-#include "NewSubpatchWindow.h"
+#include "WindowFactory.hpp"
+#include "App.hpp"
+#include "PatchWindow.hpp"
+#include "GladeFactory.hpp"
+#include "NodePropertiesWindow.hpp"
+#include "PatchPropertiesWindow.hpp"
+#include "NodeControlWindow.hpp"
+#include "LoadPluginWindow.hpp"
+#include "LoadPatchWindow.hpp"
+#include "LoadRemotePatchWindow.hpp"
+#include "UploadPatchWindow.hpp"
+#include "LoadSubpatchWindow.hpp"
+#include "RenameWindow.hpp"
+#include "NewSubpatchWindow.hpp"
 
 namespace Ingen {
 namespace GUI {
diff --git a/src/libs/gui/WindowFactory.h b/src/libs/gui/WindowFactory.hpp
index c3170dce..0227f728 100644
--- a/src/libs/gui/WindowFactory.h
+++ b/src/libs/gui/WindowFactory.hpp
@@ -20,9 +20,9 @@
 
 #include <map>
 #include <gtkmm.h>
-#include <raul/SharedPtr.h>
-#include "client/PatchModel.h"
-#include "PatchView.h"
+#include <raul/SharedPtr.hpp>
+#include "client/PatchModel.hpp"
+#include "PatchView.hpp"
 
 using Ingen::Client::PatchModel;
 
diff --git a/src/libs/gui/gui.cpp b/src/libs/gui/gui.cpp
index bd73ac91..689adf62 100644
--- a/src/libs/gui/gui.cpp
+++ b/src/libs/gui/gui.cpp
@@ -15,10 +15,10 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "gui.h"
-#include "ConnectWindow.h"
-#include "App.h"
-#include "Configuration.h"
+#include "gui.hpp"
+#include "ConnectWindow.hpp"
+#include "App.hpp"
+#include "Configuration.hpp"
 
 namespace Ingen {
 namespace GUI {
diff --git a/src/libs/gui/gui.h b/src/libs/gui/gui.hpp
index 2c229109..992aa9d4 100644
--- a/src/libs/gui/gui.h
+++ b/src/libs/gui/gui.hpp
@@ -18,7 +18,7 @@
 #ifndef INGEN_GUI_H
 #define INGEN_GUI_H
 
-#include <raul/SharedPtr.h>
+#include <raul/SharedPtr.hpp>
 
 namespace Ingen {
 
diff --git a/src/libs/module/Makefile.am b/src/libs/module/Makefile.am
index 4d296f44..bcd2ea4f 100644
--- a/src/libs/module/Makefile.am
+++ b/src/libs/module/Makefile.am
@@ -5,5 +5,5 @@ libingen_module_la_CXXFLAGS = -I$(top_srcdir)/raul -DINGEN_MODULE_DIR=\"$(libdir
 libingen_module_la_LIBADD = @RAUL_LIBS@ @GLIBMM_LIBS@
 
 libingen_module_la_SOURCES = \
-	Module.h \
+	Module.hpp \
 	Module.cpp
diff --git a/src/libs/module/Module.cpp b/src/libs/module/Module.cpp
index 073e612d..9aacd0cc 100644
--- a/src/libs/module/Module.cpp
+++ b/src/libs/module/Module.cpp
@@ -21,7 +21,7 @@
 #include <glibmm/module.h>
 #include <glibmm/miscutils.h>
 #include <glibmm/fileutils.h>
-#include <raul/SharedPtr.h>
+#include <raul/SharedPtr.hpp>
 
 #ifndef INGEN_MODULE_DIR
 #error This file expects INGEN_MODULE_DIR to be defined.
diff --git a/src/libs/module/Module.h b/src/libs/module/Module.hpp
index 58ed014f..2d9ba382 100644
--- a/src/libs/module/Module.h
+++ b/src/libs/module/Module.hpp
@@ -17,7 +17,7 @@
 
 #include <string>
 #include <glibmm/module.h>
-#include <raul/SharedPtr.h>
+#include <raul/SharedPtr.hpp>
 
 namespace Ingen {
 namespace Shared {
diff --git a/src/libs/serialisation/Loader.cpp b/src/libs/serialisation/Loader.cpp
index f4c84f25..c14c8a1f 100644
--- a/src/libs/serialisation/Loader.cpp
+++ b/src/libs/serialisation/Loader.cpp
@@ -18,10 +18,10 @@
 #include <iostream>
 #include <locale.h>
 #include <glibmm/ustring.h>
-#include <raul/RDFModel.h>
-#include <raul/RDFQuery.h>
-#include "interface/EngineInterface.h"
-#include "Loader.h"
+#include <raul/RDFModel.hpp>
+#include <raul/RDFQuery.hpp>
+#include "interface/EngineInterface.hpp"
+#include "Loader.hpp"
 
 using namespace std;
 using namespace Raul;
diff --git a/src/libs/serialisation/Loader.h b/src/libs/serialisation/Loader.hpp
index a02e5cdb..b729e71d 100644
--- a/src/libs/serialisation/Loader.h
+++ b/src/libs/serialisation/Loader.hpp
@@ -22,9 +22,9 @@
 #include <map>
 #include <glibmm/ustring.h>
 #include <boost/optional.hpp>
-#include <raul/SharedPtr.h>
-#include <raul/Path.h>
-#include <raul/Atom.h>
+#include <raul/SharedPtr.hpp>
+#include <raul/Path.hpp>
+#include <raul/Atom.hpp>
 
 namespace Raul { class Atom; namespace RDF { class World; } }
 namespace Ingen { namespace Shared { class EngineInterface; } }
diff --git a/src/libs/serialisation/Makefile.am b/src/libs/serialisation/Makefile.am
index 4dbacc5f..556ab653 100644
--- a/src/libs/serialisation/Makefile.am
+++ b/src/libs/serialisation/Makefile.am
@@ -9,8 +9,8 @@ libingen_serialisation_la_LDFLAGS = -no-undefined -module -avoid-version
 libingen_serialisation_la_LIBADD = @RAUL_LIBS@ @GLIBMM_LIBS@
 
 libingen_serialisation_la_SOURCES = \
-	serialisation.h \
+	serialisation.hpp \
 	serialisation.cpp \
-	Loader.h \
+	Loader.hpp \
 	Loader.cpp
 
diff --git a/src/libs/serialisation/serialisation.cpp b/src/libs/serialisation/serialisation.cpp
index e0764fc1..969cf9f2 100644
--- a/src/libs/serialisation/serialisation.cpp
+++ b/src/libs/serialisation/serialisation.cpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "serialisation.h"
-#include "Loader.h"
+#include "serialisation.hpp"
+#include "Loader.hpp"
 
 namespace Ingen {
 namespace Serialisation {
diff --git a/src/libs/serialisation/serialisation.h b/src/libs/serialisation/serialisation.hpp
index f65b9c2e..f65b9c2e 100644
--- a/src/libs/serialisation/serialisation.h
+++ b/src/libs/serialisation/serialisation.hpp