15 files changed, 43 insertions, 43 deletions
diff --git a/src/client/ClientStore.hpp b/src/client/ClientStore.hpp
index 63b03dae..1421ca13 100644
--- a/src/client/ClientStore.hpp
+++ b/src/client/ClientStore.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef CLIENT_STORE_HPP
-#define CLIENT_STORE_HPP
+#ifndef INGEN_CLIENT_CLIENTSTORE_HPP
+#define INGEN_CLIENT_CLIENTSTORE_HPP
 
 #include <cassert>
 #include <string>
@@ -110,4 +110,4 @@ private:
 } // namespace Client
 } // namespace Ingen
 
-#endif // CLIENT_STORE_HPP
+#endif // INGEN_CLIENT_CLIENTSTORE_HPP
diff --git a/src/client/ConnectionModel.hpp b/src/client/ConnectionModel.hpp
index 9e066c65..07618ee9 100644
--- a/src/client/ConnectionModel.hpp
+++ b/src/client/ConnectionModel.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef CONNECTIONMODEL_H
-#define CONNECTIONMODEL_H
+#ifndef INGEN_CLIENT_CONNECTIONMODEL_HPP
+#define INGEN_CLIENT_CONNECTIONMODEL_HPP
 
 #include <cassert>
 #include <string>
@@ -73,4 +73,4 @@ private:
 } // namespace Client
 } // namespace Ingen
 
-#endif // CONNECTIONMODEL_H
+#endif // INGEN_CLIENT_CONNECTIONMODEL_HPP
diff --git a/src/client/DeprecatedLoader.hpp b/src/client/DeprecatedLoader.hpp
index 18a89bb5..5ae96e2d 100644
--- a/src/client/DeprecatedLoader.hpp
+++ b/src/client/DeprecatedLoader.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef PATCHLIBRARIAN_H
-#define PATCHLIBRARIAN_H
+#ifndef INGEN_CLIENT_DEPRECATEDLOADER_HPP
+#define INGEN_CLIENT_DEPRECATEDLOADER_HPP
 
 #include <map>
 #include <utility>
@@ -83,4 +83,4 @@ private:
 } // namespace Client
 } // namespace Ingen
 
-#endif // PATCHLIBRARIAN_H
+#endif // INGEN_CLIENT_DEPRECATEDLOADER_HPP
diff --git a/src/client/HTTPClientReceiver.hpp b/src/client/HTTPClientReceiver.hpp
index 58896672..63727dcb 100644
--- a/src/client/HTTPClientReceiver.hpp
+++ b/src/client/HTTPClientReceiver.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef HTTPCLIENTRECEIVER_H
-#define HTTPCLIENTRECEIVER_H
+#ifndef INGEN_CLIENT_HTTPCLIENTRECEIVER_HPP
+#define INGEN_CLIENT_HTTPCLIENTRECEIVER_HPP
 
 #include <cstdlib>
 #include <boost/utility.hpp>
@@ -80,4 +80,4 @@ private:
 } // namespace Client
 } // namespace Ingen
 
-#endif // HTTPCLIENTRECEIVER_H
+#endif // INGEN_CLIENT_HTTPCLIENTRECEIVER_HPP
diff --git a/src/client/HTTPEngineSender.hpp b/src/client/HTTPEngineSender.hpp
index 971793d5..9d84fc2e 100644
--- a/src/client/HTTPEngineSender.hpp
+++ b/src/client/HTTPEngineSender.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef HTTPENGINESENDER_H
-#define HTTPENGINESENDER_H
+#ifndef INGEN_CLIENT_HTTPENGINESENDER_HPP
+#define INGEN_CLIENT_HTTPENGINESENDER_HPP
 
 #include <inttypes.h>
 #include <string>
@@ -131,5 +131,5 @@ protected:
 } // namespace Client
 } // namespace Ingen
 
-#endif // HTTPENGINESENDER_H
+#endif // INGEN_CLIENT_HTTPENGINESENDER_HPP
 
diff --git a/src/client/NodeModel.hpp b/src/client/NodeModel.hpp
index 3c150700..3b0877d1 100644
--- a/src/client/NodeModel.hpp
+++ b/src/client/NodeModel.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef NODEMODEL_H
-#define NODEMODEL_H
+#ifndef INGEN_CLIENT_NODEMODEL_HPP
+#define INGEN_CLIENT_NODEMODEL_HPP
 
 #include <cstdlib>
 #include <string>
@@ -99,4 +99,4 @@ private:
 } // namespace Client
 } // namespace Ingen
 
-#endif // NODEMODEL_H
+#endif // INGEN_CLIENT_NODEMODEL_HPP
diff --git a/src/client/OSCClientReceiver.hpp b/src/client/OSCClientReceiver.hpp
index d0cc4706..cd955363 100644
--- a/src/client/OSCClientReceiver.hpp
+++ b/src/client/OSCClientReceiver.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef OSCCLIENTRECEIVER_H
-#define OSCCLIENTRECEIVER_H
+#ifndef INGEN_CLIENT_OSCCLIENTRECEIVER_HPP
+#define INGEN_CLIENT_OSCCLIENTRECEIVER_HPP
 
 #include <cstdlib>
 #include <boost/utility.hpp>
@@ -101,4 +101,4 @@ private:
 } // namespace Client
 } // namespace Ingen
 
-#endif // OSCCLIENTRECEIVER_H
+#endif // INGEN_CLIENT_OSCCLIENTRECEIVER_HPP
diff --git a/src/client/OSCEngineSender.hpp b/src/client/OSCEngineSender.hpp
index 8311cbb1..04075e39 100644
--- a/src/client/OSCEngineSender.hpp
+++ b/src/client/OSCEngineSender.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef OSCENGINESENDER_H
-#define OSCENGINESENDER_H
+#ifndef INGEN_CLIENT_OSCENGINESENDER_HPP
+#define INGEN_CLIENT_OSCENGINESENDER_HPP
 
 #include <inttypes.h>
 #include <string>
@@ -125,5 +125,5 @@ protected:
 } // namespace Client
 } // namespace Ingen
 
-#endif // OSCENGINESENDER_H
+#endif // INGEN_CLIENT_OSCENGINESENDER_HPP
 
diff --git a/src/client/ObjectModel.hpp b/src/client/ObjectModel.hpp
index 79ae1fe9..7ce19e9c 100644
--- a/src/client/ObjectModel.hpp
+++ b/src/client/ObjectModel.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef OBJECTMODEL_H
-#define OBJECTMODEL_H
+#ifndef INGEN_CLIENT_OBJECTMODEL_HPP
+#define INGEN_CLIENT_OBJECTMODEL_HPP
 
 #include <cstdlib>
 #include <algorithm>
@@ -97,4 +97,4 @@ protected:
 } // namespace Client
 } // namespace Ingen
 
-#endif // OBJECTMODEL_H
+#endif // INGEN_CLIENT_OBJECTMODEL_HPP
diff --git a/src/client/PatchModel.hpp b/src/client/PatchModel.hpp
index 8245ee5a..748c2704 100644
--- a/src/client/PatchModel.hpp
+++ b/src/client/PatchModel.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef PATCHMODEL_H
-#define PATCHMODEL_H
+#ifndef INGEN_CLIENT_PATCHMODEL_HPP
+#define INGEN_CLIENT_PATCHMODEL_HPP
 
 #include <cassert>
 #include <sigc++/sigc++.h>
@@ -98,4 +98,4 @@ private:
 } // namespace Client
 } // namespace Ingen
 
-#endif // PATCHMODEL_H
+#endif // INGEN_CLIENT_PATCHMODEL_HPP
diff --git a/src/client/PluginModel.hpp b/src/client/PluginModel.hpp
index 01cc14dc..4d54cd53 100644
--- a/src/client/PluginModel.hpp
+++ b/src/client/PluginModel.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef PLUGINMODEL_H
-#define PLUGINMODEL_H
+#ifndef INGEN_CLIENT_PLUGINMODEL_HPP
+#define INGEN_CLIENT_PLUGINMODEL_HPP
 
 #include "ingen-config.h"
 #include "raul/SharedPtr.hpp"
@@ -113,5 +113,5 @@ private:
 } // namespace Client
 } // namespace Ingen
 
-#endif // PLUGINMODEL_H
+#endif // INGEN_CLIENT_PLUGINMODEL_HPP
 
diff --git a/src/client/PluginUI.hpp b/src/client/PluginUI.hpp
index 15071433..e33f149f 100644
--- a/src/client/PluginUI.hpp
+++ b/src/client/PluginUI.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef PLUGINUI_H
-#define PLUGINUI_H
+#ifndef INGEN_CLIENT_PLUGINUI_HPP
+#define INGEN_CLIENT_PLUGINUI_HPP
 
 #include "slv2/slv2.h"
 #include "raul/SharedPtr.hpp"
@@ -63,6 +63,6 @@ private:
 } // namespace Client
 } // namespace Ingen
 
-#endif // PLUGINUI_H
+#endif // INGEN_CLIENT_PLUGINUI_HPP
 
 
diff --git a/src/client/PortModel.hpp b/src/client/PortModel.hpp
index 74b15283..8cf0dccb 100644
--- a/src/client/PortModel.hpp
+++ b/src/client/PortModel.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef PORTMODEL_H
-#define PORTMODEL_H
+#ifndef INGEN_CLIENT_PORTMODEL_HPP
+#define INGEN_CLIENT_PORTMODEL_HPP
 
 #include <cstdlib>
 #include <string>
@@ -112,4 +112,4 @@ private:
 } // namespace Client
 } // namespace Ingen
 
-#endif // PORTMODEL_H
+#endif // INGEN_CLIENT_PORTMODEL_HPP
diff --git a/src/client/SigClientInterface.hpp b/src/client/SigClientInterface.hpp
index 3a3ce9d4..f3f572ad 100644
--- a/src/client/SigClientInterface.hpp
+++ b/src/client/SigClientInterface.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef SIGCLIENTINTERFACE_H
-#define SIGCLIENTINTERFACE_H
+#ifndef INGEN_CLIENT_SIGCLIENTINTERFACE_HPP
+#define INGEN_CLIENT_SIGCLIENTINTERFACE_HPP
 
 #include <inttypes.h>
 #include <sigc++/sigc++.h>
diff --git a/src/client/ThreadedSigClientInterface.hpp b/src/client/ThreadedSigClientInterface.hpp
index 456aa67f..e0065fab 100644
--- a/src/client/ThreadedSigClientInterface.hpp
+++ b/src/client/ThreadedSigClientInterface.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef THREADEDSIGCLIENTINTERFACE_H
-#define THREADEDSIGCLIENTINTERFACE_H
+#ifndef INGEN_CLIENT_THREADEDSIGCLIENTINTERFACE_HPP
+#define INGEN_CLIENT_THREADEDSIGCLIENTINTERFACE_HPP
 
 #include <inttypes.h>
 #include <string>