72 files changed, 367 insertions, 366 deletions

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 {