Use consistent and more globally unique inclusion guards.

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

84 files changed, 251 insertions, 251 deletions

diff --git a/src/engine/AudioBuffer.hpp b/src/engine/AudioBuffer.hpp
index 8a0ed67e..b8500537 100644
--- a/src/engine/AudioBuffer.hpp
+++ b/src/engine/AudioBuffer.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AUDIOBUFFER_H
-#define AUDIOBUFFER_H
+#ifndef INGEN_ENGINE_AUDIOBUFFER_HPP
+#define INGEN_ENGINE_AUDIOBUFFER_HPP
 
 #include <cstddef>
 #include <cassert>
@@ -77,4 +77,4 @@ private:
 
 } // namespace Ingen
 
-#endif // AUDIOBUFFER_H
+#endif // INGEN_ENGINE_AUDIOBUFFER_HPP
diff --git a/src/engine/AudioDriver.hpp b/src/engine/AudioDriver.hpp
index 33c9d5ef..712715d9 100644
--- a/src/engine/AudioDriver.hpp
+++ b/src/engine/AudioDriver.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AUDIODRIVER_H
-#define AUDIODRIVER_H
+#ifndef INGEN_ENGINE_AUDIODRIVER_HPP
+#define INGEN_ENGINE_AUDIODRIVER_HPP
 
 #include "raul/Path.hpp"
 #include "Driver.hpp"
@@ -61,4 +61,4 @@ public:
 
 } // namespace Ingen
 
-#endif // AUDIODRIVER_H
+#endif // INGEN_ENGINE_AUDIODRIVER_HPP
diff --git a/src/engine/Buffer.hpp b/src/engine/Buffer.hpp
index 61455603..0d2574e6 100644
--- a/src/engine/Buffer.hpp
+++ b/src/engine/Buffer.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef BUFFER_HPP
-#define BUFFER_HPP
+#ifndef INGEN_ENGINE_BUFFER_HPP
+#define INGEN_ENGINE_BUFFER_HPP
 
 #include <cstddef>
 #include <cassert>
@@ -93,4 +93,4 @@ namespace boost {
 }
 
 
-#endif // BUFFER_HPP
+#endif // INGEN_ENGINE_BUFFER_HPP
diff --git a/src/engine/BufferFactory.hpp b/src/engine/BufferFactory.hpp
index 8fddb70f..1978e895 100644
--- a/src/engine/BufferFactory.hpp
+++ b/src/engine/BufferFactory.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef BUFFER_FACTORY_H
-#define BUFFER_FACTORY_H
+#ifndef INGEN_ENGINE_BUFFERFACTORY_HPP
+#define INGEN_ENGINE_BUFFERFACTORY_HPP
 
 #include <map>
 #include <boost/intrusive_ptr.hpp>
@@ -72,4 +72,4 @@ private:
 
 } // namespace Ingen
 
-#endif // BUFFER_FACTORY_H
+#endif // INGEN_ENGINE_BUFFERFACTORY_HPP
diff --git a/src/engine/ClientBroadcaster.hpp b/src/engine/ClientBroadcaster.hpp
index fa44bc43..096b367d 100644
--- a/src/engine/ClientBroadcaster.hpp
+++ b/src/engine/ClientBroadcaster.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef CLIENTBROADCASTER_H
-#define CLIENTBROADCASTER_H
+#ifndef INGEN_ENGINE_CLIENTBROADCASTER_HPP
+#define INGEN_ENGINE_CLIENTBROADCASTER_HPP
 
 #include <string>
 #include <list>
@@ -135,5 +135,5 @@ private:
 
 } // namespace Ingen
 
-#endif // CLIENTBROADCASTER_H
+#endif // INGEN_ENGINE_CLIENTBROADCASTER_HPP
 
diff --git a/src/engine/CompiledPatch.hpp b/src/engine/CompiledPatch.hpp
index d6a61f50..7cb713e2 100644
--- a/src/engine/CompiledPatch.hpp
+++ b/src/engine/CompiledPatch.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef COMPILED_PATCH_HPP
-#define COMPILED_PATCH_HPP
+#ifndef INGEN_ENGINE_COMPILEDPATCH_HPP
+#define INGEN_ENGINE_COMPILEDPATCH_HPP
 
 #include <vector>
 #include "raul/List.hpp"
@@ -73,4 +73,4 @@ struct CompiledPatch : public std::vector<CompiledNode>
 
 } // namespace Ingen
 
-#endif // COMPILED_PATCH_HPP
+#endif // INGEN_ENGINE_COMPILEDPATCH_HPP
diff --git a/src/engine/ConnectionImpl.hpp b/src/engine/ConnectionImpl.hpp
index 00770047..bd115293 100644
--- a/src/engine/ConnectionImpl.hpp
+++ b/src/engine/ConnectionImpl.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef CONNECTIONIMPL_H
-#define CONNECTIONIMPL_H
+#ifndef INGEN_ENGINE_CONNECTIONIMPL_HPP
+#define INGEN_ENGINE_CONNECTIONIMPL_HPP
 
 #include <cstdlib>
 #include <boost/utility.hpp>
@@ -104,4 +104,4 @@ protected:
 
 } // namespace Ingen
 
-#endif // CONNECTIONIMPL_H
+#endif // INGEN_ENGINE_CONNECTIONIMPL_HPP
diff --git a/src/engine/Context.hpp b/src/engine/Context.hpp
index 0029e00c..e0bc924e 100644
--- a/src/engine/Context.hpp
+++ b/src/engine/Context.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef CONTEXT_H
-#define CONTEXT_H
+#ifndef INGEN_ENGINE_CONTEXT_HPP
+#define INGEN_ENGINE_CONTEXT_HPP
 
 #include "EventSink.hpp"
 #include "tuning.hpp"
@@ -67,5 +67,5 @@ private:
 
 } // namespace Ingen
 
-#endif // CONTEXT_H
+#endif // INGEN_ENGINE_CONTEXT_HPP
 
diff --git a/src/engine/ControlBindings.hpp b/src/engine/ControlBindings.hpp
index 8823ecb1..e9ab290f 100644
--- a/src/engine/ControlBindings.hpp
+++ b/src/engine/ControlBindings.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef CONTROL_BINDINGS_HPP
-#define CONTROL_BINDINGS_HPP
+#ifndef INGEN_ENGINE_CONTROLBINDINGS_HPP
+#define INGEN_ENGINE_CONTROLBINDINGS_HPP
 
 #include <stdint.h>
 #include <map>
@@ -64,4 +64,4 @@ private:
 
 } // namespace Ingen
 
-#endif // CONTROL_BINDINGS_HPP
+#endif // INGEN_ENGINE_CONTROLBINDINGS_HPP
diff --git a/src/engine/Driver.hpp b/src/engine/Driver.hpp
index cc1bec6c..53db2ab1 100644
--- a/src/engine/Driver.hpp
+++ b/src/engine/Driver.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef DRIVER_H
-#define DRIVER_H
+#ifndef INGEN_ENGINE_DRIVER_HPP
+#define INGEN_ENGINE_DRIVER_HPP
 
 #include <string>
 #include <boost/utility.hpp>
@@ -122,4 +122,4 @@ public:
 
 } // namespace Ingen
 
-#endif // DRIVER_H
+#endif // INGEN_ENGINE_DRIVER_HPP
diff --git a/src/engine/DuplexPort.hpp b/src/engine/DuplexPort.hpp
index 31c679b5..a5963908 100644
--- a/src/engine/DuplexPort.hpp
+++ b/src/engine/DuplexPort.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef DUPLEXPORT_H
-#define DUPLEXPORT_H
+#ifndef INGEN_ENGINE_DUPLEXPORT_HPP
+#define INGEN_ENGINE_DUPLEXPORT_HPP
 
 #include <string>
 #include "Buffer.hpp"
@@ -64,4 +64,4 @@ protected:
 
 } // namespace Ingen
 
-#endif // DUPLEXPORT_H
+#endif // INGEN_ENGINE_DUPLEXPORT_HPP
diff --git a/src/engine/Engine.hpp b/src/engine/Engine.hpp
index 9a665077..e7892f84 100644
--- a/src/engine/Engine.hpp
+++ b/src/engine/Engine.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef ENGINE_H
-#define ENGINE_H
+#ifndef INGEN_ENGINE_ENGINE_HPP
+#define INGEN_ENGINE_ENGINE_HPP
 
 #include <cassert>
 #include <vector>
@@ -126,4 +126,4 @@ private:
 
 } // namespace Ingen
 
-#endif // ENGINE_H
+#endif // INGEN_ENGINE_ENGINE_HPP
diff --git a/src/engine/EngineStore.hpp b/src/engine/EngineStore.hpp
index 7ae5dbb7..a59af4f1 100644
--- a/src/engine/EngineStore.hpp
+++ b/src/engine/EngineStore.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef OBJECTSTORE_H
-#define OBJECTSTORE_H
+#ifndef INGEN_ENGINE_OBJECTSTORE_HPP
+#define INGEN_ENGINE_OBJECTSTORE_HPP
 
 #include <string>
 #include "raul/SharedPtr.hpp"
diff --git a/src/engine/Event.hpp b/src/engine/Event.hpp
index d3bf44b4..d4ee596b 100644
--- a/src/engine/Event.hpp
+++ b/src/engine/Event.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef EVENT_H
-#define EVENT_H
+#ifndef INGEN_ENGINE_EVENT_HPP
+#define INGEN_ENGINE_EVENT_HPP
 
 #include <cassert>
 #include "raul/SharedPtr.hpp"
@@ -73,4 +73,4 @@ protected:
 
 } // namespace Ingen
 
-#endif // EVENT_H
+#endif // INGEN_ENGINE_EVENT_HPP
diff --git a/src/engine/EventBuffer.hpp b/src/engine/EventBuffer.hpp
index d094e4a4..3cddf6c1 100644
--- a/src/engine/EventBuffer.hpp
+++ b/src/engine/EventBuffer.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef EVENTBUFFER_H
-#define EVENTBUFFER_H
+#ifndef INGEN_ENGINE_EVENTBUFFER_HPP
+#define INGEN_ENGINE_EVENTBUFFER_HPP
 
 #include "event.lv2/event.h"
 #include "event.lv2/event-helpers.h"
@@ -83,4 +83,4 @@ private:
 
 } // namespace Ingen
 
-#endif // EVENTBUFFER_H
+#endif // INGEN_ENGINE_EVENTBUFFER_HPP
diff --git a/src/engine/EventSink.hpp b/src/engine/EventSink.hpp
index 5c2899b4..d1514901 100644
--- a/src/engine/EventSink.hpp
+++ b/src/engine/EventSink.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef EVENTSINK_H
-#define EVENTSINK_H
+#ifndef INGEN_ENGINE_EVENTSINK_HPP
+#define INGEN_ENGINE_EVENTSINK_HPP
 
 #include <stdint.h>
 #include <list>
@@ -56,5 +56,5 @@ private:
 
 } // namespace Ingen
 
-#endif // EVENTSINK_H
+#endif // INGEN_ENGINE_EVENTSINK_HPP
 
diff --git a/src/engine/EventSource.hpp b/src/engine/EventSource.hpp
index 97dfa4cb..d3d813e0 100644
--- a/src/engine/EventSource.hpp
+++ b/src/engine/EventSource.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef INGEN_EVENT_SOURCE_HPP
-#define INGEN_EVENT_SOURCE_HPP
+#ifndef INGEN_ENGINE_EVENTSOURCE_HPP
+#define INGEN_ENGINE_EVENTSOURCE_HPP
 
 #include "raul/Semaphore.hpp"
 #include "raul/Slave.hpp"
@@ -70,5 +70,5 @@ private:
 
 } // namespace Ingen
 
-#endif // INGEN_EVENT_SOURCE_HPP
+#endif // INGEN_ENGINE_EVENTSOURCE_HPP
 
diff --git a/src/engine/GraphObjectImpl.hpp b/src/engine/GraphObjectImpl.hpp
index e855cbb9..b9e13219 100644
--- a/src/engine/GraphObjectImpl.hpp
+++ b/src/engine/GraphObjectImpl.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef GRAPHOBJECTIMPL_H
-#define GRAPHOBJECTIMPL_H
+#ifndef INGEN_ENGINE_GRAPHOBJECTIMPL_HPP
+#define INGEN_ENGINE_GRAPHOBJECTIMPL_HPP
 
 #include <string>
 #include <map>
@@ -103,4 +103,4 @@ protected:
 
 } // namespace Ingen
 
-#endif // GRAPHOBJECTIMPL_H
+#endif // INGEN_ENGINE_GRAPHOBJECTIMPL_HPP
diff --git a/src/engine/HTTPClientSender.hpp b/src/engine/HTTPClientSender.hpp
index e7120e81..f25e1eeb 100644
--- a/src/engine/HTTPClientSender.hpp
+++ b/src/engine/HTTPClientSender.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef HTTPCLIENTSENDER_H
-#define HTTPCLIENTSENDER_H
+#ifndef INGEN_ENGINE_HTTPCLIENTSENDER_HPP
+#define INGEN_ENGINE_HTTPCLIENTSENDER_HPP
 
 #include <cassert>
 #include <string>
@@ -104,5 +104,5 @@ private:
 
 } // namespace Ingen
 
-#endif // HTTPCLIENTSENDER_H
+#endif // INGEN_ENGINE_HTTPCLIENTSENDER_HPP
 
diff --git a/src/engine/HTTPEngineReceiver.hpp b/src/engine/HTTPEngineReceiver.hpp
index 79101e90..b7479314 100644
--- a/src/engine/HTTPEngineReceiver.hpp
+++ b/src/engine/HTTPEngineReceiver.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef HTTPENGINERECEIVER_H
-#define HTTPENGINERECEIVER_H
+#ifndef INGEN_ENGINE_HTTPENGINERECEIVER_HPP
+#define INGEN_ENGINE_HTTPENGINERECEIVER_HPP
 
 #include <string>
 #include <stdint.h>
@@ -57,4 +57,4 @@ private:
 
 } // namespace Ingen
 
-#endif // HTTPENGINERECEIVER_H
+#endif // INGEN_ENGINE_HTTPENGINERECEIVER_HPP
diff --git a/src/engine/InputPort.hpp b/src/engine/InputPort.hpp
index b44c594e..4ed1bc0e 100644
--- a/src/engine/InputPort.hpp
+++ b/src/engine/InputPort.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef INPUTPORT_H
-#define INPUTPORT_H
+#ifndef INGEN_ENGINE_INPUTPORT_HPP
+#define INGEN_ENGINE_INPUTPORT_HPP
 
 #include <string>
 #include <cstdlib>
@@ -84,4 +84,4 @@ protected:
 
 } // namespace Ingen
 
-#endif // INPUTPORT_H
+#endif // INGEN_ENGINE_INPUTPORT_HPP
diff --git a/src/engine/InternalPlugin.hpp b/src/engine/InternalPlugin.hpp
index 70f1ba27..d1c0e76e 100644
--- a/src/engine/InternalPlugin.hpp
+++ b/src/engine/InternalPlugin.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef INTERNALPLUGIN_H
-#define INTERNALPLUGIN_H
+#ifndef INGEN_ENGINE_INTERNALPLUGIN_HPP
+#define INGEN_ENGINE_INTERNALPLUGIN_HPP
 
 #include "ingen-config.h"
 
@@ -61,5 +61,5 @@ private:
 
 } // namespace Ingen
 
-#endif // INTERNALPLUGIN_H
+#endif // INGEN_ENGINE_INTERNALPLUGIN_HPP
 
diff --git a/src/engine/JackDriver.hpp b/src/engine/JackDriver.hpp
index 1e7165d1..6f63ff92 100644
--- a/src/engine/JackDriver.hpp
+++ b/src/engine/JackDriver.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef JACKAUDIODRIVER_H
-#define JACKAUDIODRIVER_H
+#ifndef INGEN_ENGINE_JACKAUDIODRIVER_HPP
+#define INGEN_ENGINE_JACKAUDIODRIVER_HPP
 
 #include <jack/jack.h>
 #include <jack/transport.h>
@@ -167,4 +167,4 @@ private:
 
 } // namespace Ingen
 
-#endif // JACKAUDIODRIVER_H
+#endif // INGEN_ENGINE_JACKAUDIODRIVER_HPP
diff --git a/src/engine/LADSPANode.hpp b/src/engine/LADSPANode.hpp
index b241c471..6585b2ad 100644
--- a/src/engine/LADSPANode.hpp
+++ b/src/engine/LADSPANode.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef LADSPANODE_H
-#define LADSPANODE_H
+#ifndef INGEN_ENGINE_LADSPANODE_HPP
+#define INGEN_ENGINE_LADSPANODE_HPP
 
 #include <string>
 #include <ladspa.h>
@@ -72,4 +72,4 @@ protected:
 
 } // namespace Ingen
 
-#endif // LADSPANODE_H
+#endif // INGEN_ENGINE_LADSPANODE_HPP
diff --git a/src/engine/LADSPAPlugin.hpp b/src/engine/LADSPAPlugin.hpp
index 5c5e4faa..0d0b91ce 100644
--- a/src/engine/LADSPAPlugin.hpp
+++ b/src/engine/LADSPAPlugin.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef LADSPAPLUGIN_H
-#define LADSPAPLUGIN_H
+#ifndef INGEN_ENGINE_LADSPAPLUGIN_HPP
+#define INGEN_ENGINE_LADSPAPLUGIN_HPP
 
 #include <cstdlib>
 #include <glibmm/module.h>
@@ -69,5 +69,5 @@ private:
 
 } // namespace Ingen
 
-#endif // LADSPAPLUGIN_H
+#endif // INGEN_ENGINE_LADSPAPLUGIN_HPP
 
diff --git a/src/engine/LV2BlobFeature.hpp b/src/engine/LV2BlobFeature.hpp
index 13b6753e..e7ada0ee 100644
--- a/src/engine/LV2BlobFeature.hpp
+++ b/src/engine/LV2BlobFeature.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef LV2_BLOB_FEATURE_H
-#define LV2_BLOB_FEATURE_H
+#ifndef INGEN_ENGINE_LV2BLOBFEATURE_HPP
+#define INGEN_ENGINE_LV2BLOBFEATURE_HPP
 
 #include "shared/LV2Features.hpp"
 
@@ -61,4 +61,4 @@ private:
 
 } // namespace Ingen
 
-#endif // LV2_BLOB_FEATURE_H
+#endif // INGEN_ENGINE_LV2BLOBFEATURE_HPP
diff --git a/src/engine/LV2EventFeature.hpp b/src/engine/LV2EventFeature.hpp
index b2baaeec..e8dde511 100644
--- a/src/engine/LV2EventFeature.hpp
+++ b/src/engine/LV2EventFeature.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef LV2_EVENT_FEATURE_H
-#define LV2_EVENT_FEATURE_H
+#ifndef INGEN_ENGINE_LV2EVENTFEATURE_HPP
+#define INGEN_ENGINE_LV2EVENTFEATURE_HPP
 
 #include "shared/LV2Features.hpp"
 
@@ -48,4 +48,4 @@ private:
 
 } // namespace Ingen
 
-#endif // LV2_EVENT_FEATURE_H
+#endif // INGEN_ENGINE_LV2EVENTFEATURE_HPP
diff --git a/src/engine/LV2Info.hpp b/src/engine/LV2Info.hpp
index 2a63f983..1044098a 100644
--- a/src/engine/LV2Info.hpp
+++ b/src/engine/LV2Info.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef LV2INFO_H
-#define LV2INFO_H
+#ifndef INGEN_ENGINE_LV2INFO_HPP
+#define INGEN_ENGINE_LV2INFO_HPP
 
 #include "ingen-config.h"
 #ifndef HAVE_SLV2
@@ -63,4 +63,4 @@ private:
 
 } // namespace Ingen
 
-#endif // LV2INFO_H
+#endif // INGEN_ENGINE_LV2INFO_HPP
diff --git a/src/engine/LV2Node.hpp b/src/engine/LV2Node.hpp
index 7f1714f1..3bc37dc5 100644
--- a/src/engine/LV2Node.hpp
+++ b/src/engine/LV2Node.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef LV2NODE_H
-#define LV2NODE_H
+#ifndef INGEN_ENGINE_LV2NODE_HPP
+#define INGEN_ENGINE_LV2NODE_HPP
 
 #include <string>
 #include "slv2/slv2.h"
@@ -74,5 +74,5 @@ protected:
 
 } // namespace Ingen
 
-#endif // LV2NODE_H
+#endif // INGEN_ENGINE_LV2NODE_HPP
 
diff --git a/src/engine/LV2Plugin.hpp b/src/engine/LV2Plugin.hpp
index 2a6f1996..8dc0d8bf 100644
--- a/src/engine/LV2Plugin.hpp
+++ b/src/engine/LV2Plugin.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef LV2PLUGIN_H
-#define LV2PLUGIN_H
+#ifndef INGEN_ENGINE_LV2PLUGIN_HPP
+#define INGEN_ENGINE_LV2PLUGIN_HPP
 
 #include "ingen-config.h"
 
@@ -70,5 +70,5 @@ private:
 
 } // namespace Ingen
 
-#endif // LV2PLUGIN_H
+#endif // INGEN_ENGINE_LV2PLUGIN_HPP
 
diff --git a/src/engine/LV2ResizeFeature.hpp b/src/engine/LV2ResizeFeature.hpp
index 723d9447..d65ea260 100644
--- a/src/engine/LV2ResizeFeature.hpp
+++ b/src/engine/LV2ResizeFeature.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef LV2_RESIZE_FEATURE_H
-#define LV2_RESIZE_FEATURE_H
+#ifndef INGEN_ENGINE_LV2RESIZEFEATURE_HPP
+#define INGEN_ENGINE_LV2RESIZEFEATURE_HPP
 
 #include "raul/log.hpp"
 #include "shared/LV2Features.hpp"
@@ -66,4 +66,4 @@ struct ResizeFeature : public Shared::LV2Features::Feature {
 
 } // namespace Ingen
 
-#endif // LV2_RESIZE_FEATURE_H
+#endif // INGEN_ENGINE_LV2RESIZEFEATURE_HPP
diff --git a/src/engine/MessageContext.hpp b/src/engine/MessageContext.hpp
index a68d9927..e8067d9a 100644
--- a/src/engine/MessageContext.hpp
+++ b/src/engine/MessageContext.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef MESSAGECONTEXT_H
-#define MESSAGECONTEXT_H
+#ifndef INGEN_ENGINE_MESSAGECONTEXT_HPP
+#define INGEN_ENGINE_MESSAGECONTEXT_HPP
 
 #include <set>
 #include <glibmm/thread.h>
@@ -110,5 +110,5 @@ protected:
 
 } // namespace Ingen
 
-#endif // MESSAGECONTEXT_H
+#endif // INGEN_ENGINE_MESSAGECONTEXT_HPP
 
diff --git a/src/engine/NodeBase.hpp b/src/engine/NodeBase.hpp
index cf7ae0d6..a85d51b5 100644
--- a/src/engine/NodeBase.hpp
+++ b/src/engine/NodeBase.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef NODEBASE_H
-#define NODEBASE_H
+#ifndef INGEN_ENGINE_NODEBASE_HPP
+#define INGEN_ENGINE_NODEBASE_HPP
 
 #include "types.hpp"
 #include <string>
@@ -139,4 +139,4 @@ protected:
 
 } // namespace Ingen
 
-#endif // NODEBASE_H
+#endif // INGEN_ENGINE_NODEBASE_HPP
diff --git a/src/engine/NodeFactory.hpp b/src/engine/NodeFactory.hpp
index 1c8299b2..3b1ce192 100644
--- a/src/engine/NodeFactory.hpp
+++ b/src/engine/NodeFactory.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef NODEFACTORY_H
-#define NODEFACTORY_H
+#ifndef INGEN_ENGINE_NODEFACTORY_HPP
+#define INGEN_ENGINE_NODEFACTORY_HPP
 
 #include <list>
 #include <map>
@@ -88,4 +88,4 @@ private:
 
 } // namespace Ingen
 
-#endif // NODEFACTORY_H
+#endif // INGEN_ENGINE_NODEFACTORY_HPP
diff --git a/src/engine/NodeImpl.hpp b/src/engine/NodeImpl.hpp
index cbb212b7..01901df9 100644
--- a/src/engine/NodeImpl.hpp
+++ b/src/engine/NodeImpl.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef NODEIMPL_H
-#define NODEIMPL_H
+#ifndef INGEN_ENGINE_NODEIMPL_HPP
+#define INGEN_ENGINE_NODEIMPL_HPP
 
 #include <string>
 #include "raul/IntrusivePtr.hpp"
@@ -176,4 +176,4 @@ public:
 
 } // namespace Ingen
 
-#endif // NODEIMPL_H
+#endif // INGEN_ENGINE_NODEIMPL_HPP
diff --git a/src/engine/OSCClientSender.hpp b/src/engine/OSCClientSender.hpp
index 1ce58d45..38cc3187 100644
--- a/src/engine/OSCClientSender.hpp
+++ b/src/engine/OSCClientSender.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef OSCCLIENTSENDER_H
-#define OSCCLIENTSENDER_H
+#ifndef INGEN_ENGINE_OSCCLIENTSENDER_HPP
+#define INGEN_ENGINE_OSCCLIENTSENDER_HPP
 
 #include <cassert>
 #include <string>
@@ -102,5 +102,5 @@ private:
 
 } // namespace Ingen
 
-#endif // OSCCLIENTSENDER_H
+#endif // INGEN_ENGINE_OSCCLIENTSENDER_HPP
 
diff --git a/src/engine/OSCEngineReceiver.hpp b/src/engine/OSCEngineReceiver.hpp
index 42ef1f5a..6e2ce08c 100644
--- a/src/engine/OSCEngineReceiver.hpp
+++ b/src/engine/OSCEngineReceiver.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef OSCENGINERECEIVER_H
-#define OSCENGINERECEIVER_H
+#ifndef INGEN_ENGINE_OSCENGINERECEIVER_HPP
+#define INGEN_ENGINE_OSCENGINERECEIVER_HPP
 
 #include <stdint.h>
 #include <lo/lo.h>
@@ -113,4 +113,4 @@ private:
 
 } // namespace Ingen
 
-#endif // OSCENGINERECEIVER_H
+#endif // INGEN_ENGINE_OSCENGINERECEIVER_HPP
diff --git a/src/engine/ObjectBuffer.hpp b/src/engine/ObjectBuffer.hpp
index 83a2e5c1..354c6f46 100644
--- a/src/engine/ObjectBuffer.hpp
+++ b/src/engine/ObjectBuffer.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef OBJECTBUFFER_H
-#define OBJECTBUFFER_H
+#ifndef INGEN_ENGINE_OBJECTBUFFER_HPP
+#define INGEN_ENGINE_OBJECTBUFFER_HPP
 
 #include "raul/Atom.hpp"
 #include "object.lv2/object.h"
@@ -50,4 +50,4 @@ private:
 
 } // namespace Ingen
 
-#endif // OBJECTBUFFER_H
+#endif // INGEN_ENGINE_OBJECTBUFFER_HPP
diff --git a/src/engine/ObjectSender.hpp b/src/engine/ObjectSender.hpp
index 2645499f..54b3bbbb 100644
--- a/src/engine/ObjectSender.hpp
+++ b/src/engine/ObjectSender.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef OBJECTSENDER_H
-#define OBJECTSENDER_H
+#ifndef INGEN_ENGINE_OBJECTSENDER_HPP
+#define INGEN_ENGINE_OBJECTSENDER_HPP
 
 #include <list>
 
@@ -56,5 +56,5 @@ private:
 
 } // namespace Ingen
 
-#endif // OBJECTSENDER_H
+#endif // INGEN_ENGINE_OBJECTSENDER_HPP
 
diff --git a/src/engine/OutputPort.hpp b/src/engine/OutputPort.hpp
index a5c92200..c936de29 100644
--- a/src/engine/OutputPort.hpp
+++ b/src/engine/OutputPort.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef OUTPUTPORT_H
-#define OUTPUTPORT_H
+#ifndef INGEN_ENGINE_OUTPUTPORT_HPP
+#define INGEN_ENGINE_OUTPUTPORT_HPP
 
 #include <string>
 #include <cstdlib>
@@ -60,4 +60,4 @@ public:
 
 } // namespace Ingen
 
-#endif // OUTPUTPORT_H
+#endif // INGEN_ENGINE_OUTPUTPORT_HPP
diff --git a/src/engine/PatchImpl.hpp b/src/engine/PatchImpl.hpp
index 4e927c0e..e86cb1bc 100644
--- a/src/engine/PatchImpl.hpp
+++ b/src/engine/PatchImpl.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef PATCHIMPL_H
-#define PATCHIMPL_H
+#ifndef INGEN_ENGINE_PATCHIMPL_HPP
+#define INGEN_ENGINE_PATCHIMPL_HPP
 
 #include <cstdlib>
 #include <string>
@@ -160,4 +160,4 @@ PatchImpl::compile_recursive(NodeImpl* n, CompiledPatch* output) const
 
 } // namespace Ingen
 
-#endif // PATCHIMPL_H
+#endif // INGEN_ENGINE_PATCHIMPL_HPP
diff --git a/src/engine/PatchPlugin.hpp b/src/engine/PatchPlugin.hpp
index 99c9359f..e4feb992 100644
--- a/src/engine/PatchPlugin.hpp
+++ b/src/engine/PatchPlugin.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef PATCHPLUGIN_H
-#define PATCHPLUGIN_H
+#ifndef INGEN_ENGINE_PATCHPLUGIN_HPP
+#define INGEN_ENGINE_PATCHPLUGIN_HPP
 
 #include "ingen-config.h"
 
@@ -61,5 +61,5 @@ private:
 
 } // namespace Ingen
 
-#endif // PATCHPLUGIN_H
+#endif // INGEN_ENGINE_PATCHPLUGIN_HPP
 
diff --git a/src/engine/PluginImpl.hpp b/src/engine/PluginImpl.hpp
index c8fb9f82..5aea4f68 100644
--- a/src/engine/PluginImpl.hpp
+++ b/src/engine/PluginImpl.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef PLUGINIMPL_H
-#define PLUGINIMPL_H
+#ifndef INGEN_ENGINE_PLUGINIMPL_HPP
+#define INGEN_ENGINE_PLUGINIMPL_HPP
 
 #include <cstdlib>
 #include <glibmm/module.h>
@@ -77,5 +77,5 @@ protected:
 
 } // namespace Ingen
 
-#endif // PLUGINIMPL_H
+#endif // INGEN_ENGINE_PLUGINIMPL_HPP
 
diff --git a/src/engine/PortImpl.hpp b/src/engine/PortImpl.hpp
index 70e8e7ab..2210431b 100644
--- a/src/engine/PortImpl.hpp
+++ b/src/engine/PortImpl.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef PORTIMPL_H
-#define PORTIMPL_H
+#ifndef INGEN_ENGINE_PORTIMPL_HPP
+#define INGEN_ENGINE_PORTIMPL_HPP
 
 #include <cstdlib>
 #include <string>
@@ -143,4 +143,4 @@ protected:
 
 } // namespace Ingen
 
-#endif // PORTIMPL_H
+#endif // INGEN_ENGINE_PORTIMPL_HPP
diff --git a/src/engine/PostProcessor.hpp b/src/engine/PostProcessor.hpp
index 6d20ee24..6450d10a 100644
--- a/src/engine/PostProcessor.hpp
+++ b/src/engine/PostProcessor.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef POSTPROCESSOR_H
-#define POSTPROCESSOR_H
+#ifndef INGEN_ENGINE_POSTPROCESSOR_HPP
+#define INGEN_ENGINE_POSTPROCESSOR_HPP
 
 #include <pthread.h>
 #include "raul/SRSWQueue.hpp"
@@ -64,4 +64,4 @@ private:
 
 } // namespace Ingen
 
-#endif // POSTPROCESSOR_H
+#endif // INGEN_ENGINE_POSTPROCESSOR_HPP
diff --git a/src/engine/ProcessContext.hpp b/src/engine/ProcessContext.hpp
index 4b3888d0..068b0c85 100644
--- a/src/engine/ProcessContext.hpp
+++ b/src/engine/ProcessContext.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef PROCESSCONTEXT_H
-#define PROCESSCONTEXT_H
+#ifndef INGEN_ENGINE_PROCESSCONTEXT_HPP
+#define INGEN_ENGINE_PROCESSCONTEXT_HPP
 
 #include "types.hpp"
 #include "EventSink.hpp"
@@ -64,5 +64,5 @@ private:
 
 } // namespace Ingen
 
-#endif // PROCESSCONTEXT_H
+#endif // INGEN_ENGINE_PROCESSCONTEXT_HPP
 
diff --git a/src/engine/ProcessSlave.hpp b/src/engine/ProcessSlave.hpp
index a309c232..eb876cfb 100644
--- a/src/engine/ProcessSlave.hpp
+++ b/src/engine/ProcessSlave.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef PROCESS_SLAVE_HPP
-#define PROCESS_SLAVE_HPP
+#ifndef INGEN_ENGINE_PROCESSSLAVE_HPP
+#define INGEN_ENGINE_PROCESSSLAVE_HPP
 
 #include <sstream>
 #include "raul/Slave.hpp"
@@ -93,5 +93,5 @@ private:
 
 } // namespace Ingen
 
-#endif // PROCESS_SLAVE_HPP
+#endif // INGEN_ENGINE_PROCESSSLAVE_HPP
 
diff --git a/src/engine/QueuedEngineInterface.hpp b/src/engine/QueuedEngineInterface.hpp
index 6c22a379..22c92efa 100644
--- a/src/engine/QueuedEngineInterface.hpp
+++ b/src/engine/QueuedEngineInterface.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef QUEUEDENGINEINTERFACE_H
-#define QUEUEDENGINEINTERFACE_H
+#ifndef INGEN_ENGINE_QUEUEDENGINEINTERFACE_HPP
+#define INGEN_ENGINE_QUEUEDENGINEINTERFACE_HPP
 
 #include <inttypes.h>
 #include <string>
@@ -124,4 +124,4 @@ private:
 
 } // namespace Ingen
 
-#endif // QUEUEDENGINEINTERFACE_H
+#endif // INGEN_ENGINE_QUEUEDENGINEINTERFACE_HPP
diff --git a/src/engine/QueuedEvent.hpp b/src/engine/QueuedEvent.hpp
index eca7da03..ab82b474 100644
--- a/src/engine/QueuedEvent.hpp
+++ b/src/engine/QueuedEvent.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef QUEUEDEVENT_H
-#define QUEUEDEVENT_H
+#ifndef INGEN_ENGINE_QUEUEDEVENT_HPP
+#define INGEN_ENGINE_QUEUEDEVENT_HPP
 
 #include "Event.hpp"
 
@@ -80,4 +80,4 @@ protected:
 
 } // namespace Ingen
 
-#endif // QUEUEDEVENT_H
+#endif // INGEN_ENGINE_QUEUEDEVENT_HPP
diff --git a/src/engine/Responder.hpp b/src/engine/Responder.hpp
index 68a082dd..625d88e6 100644
--- a/src/engine/Responder.hpp
+++ b/src/engine/Responder.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef RESPONDER_H
-#define RESPONDER_H
+#ifndef INGEN_ENGINE_RESPONDER_HPP
+#define INGEN_ENGINE_RESPONDER_HPP
 
 #include <inttypes.h>
 #include <string>
@@ -66,5 +66,5 @@ private:
 
 } // namespace Ingen
 
-#endif // RESPONDER_H
+#endif // INGEN_ENGINE_RESPONDER_HPP
 
diff --git a/src/engine/ThreadManager.hpp b/src/engine/ThreadManager.hpp
index 26368deb..3f86ba83 100644
--- a/src/engine/ThreadManager.hpp
+++ b/src/engine/ThreadManager.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef THREADMANAGER_H
-#define THREADMANAGER_H
+#ifndef INGEN_ENGINE_THREADMANAGER_HPP
+#define INGEN_ENGINE_THREADMANAGER_HPP
 
 #include <cassert>
 #include "raul/Thread.hpp"
@@ -55,4 +55,4 @@ public:
 
 } // namespace Ingen
 
-#endif // THREADMANAGER_H
+#endif // INGEN_ENGINE_THREADMANAGER_HPP
diff --git a/src/engine/events.hpp b/src/engine/events.hpp
index 501e7941..ea8d7efd 100644
--- a/src/engine/events.hpp
+++ b/src/engine/events.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef EVENTS_H
-#define EVENTS_H
+#ifndef INGEN_ENGINE_EVENTS_HPP
+#define INGEN_ENGINE_EVENTS_HPP
 
 #include "ingen-config.h"
 
@@ -43,5 +43,5 @@
 #include "events/SetPortValue.hpp"
 #include "events/UnregisterClient.hpp"
 
-#endif // EVENTS_H
+#endif // INGEN_ENGINE_EVENTS_HPP
 
diff --git a/src/engine/events/AllNotesOff.hpp b/src/engine/events/AllNotesOff.hpp
index 77fcd651..f4c07f7d 100644
--- a/src/engine/events/AllNotesOff.hpp
+++ b/src/engine/events/AllNotesOff.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef ALLNOTESOFFEVENT_H
-#define ALLNOTESOFFEVENT_H
+#ifndef INGEN_EVENTS_ALLNOTESOFF_HPP
+#define INGEN_EVENTS_ALLNOTESOFF_HPP
 
 #include "Event.hpp"
 
@@ -49,4 +49,4 @@ private:
 } // namespace Ingen
 } // namespace Events
 
-#endif // ALLNOTESOFFEVENT_H
+#endif // INGEN_EVENTS_ALLNOTESOFF_HPP
diff --git a/src/engine/events/Connect.hpp b/src/engine/events/Connect.hpp
index 53b58e52..f8e2cdfa 100644
--- a/src/engine/events/Connect.hpp
+++ b/src/engine/events/Connect.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef CONNECTIONEVENT_H
-#define CONNECTIONEVENT_H
+#ifndef INGEN_EVENTS_CONNECT_HPP
+#define INGEN_EVENTS_CONNECT_HPP
 
 #include "raul/Path.hpp"
 #include "QueuedEvent.hpp"
@@ -90,4 +90,4 @@ private:
 } // namespace Ingen
 } // namespace Events
 
-#endif // CONNECTIONEVENT_H
+#endif // INGEN_EVENTS_CONNECT_HPP
diff --git a/src/engine/events/CreateNode.hpp b/src/engine/events/CreateNode.hpp
index 8f2379b0..389c0ff5 100644
--- a/src/engine/events/CreateNode.hpp
+++ b/src/engine/events/CreateNode.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef CREATENODEEVENT_H
-#define CREATENODEEVENT_H
+#ifndef INGEN_EVENTS_CREATENODE_HPP
+#define INGEN_EVENTS_CREATENODE_HPP
 
 #include <string>
 #include "QueuedEvent.hpp"
@@ -72,4 +72,4 @@ private:
 } // namespace Ingen
 } // namespace Events
 
-#endif // CREATENODEEVENT_H
+#endif // INGEN_EVENTS_CREATENODE_HPP
diff --git a/src/engine/events/CreatePatch.hpp b/src/engine/events/CreatePatch.hpp
index 15dee643..a9f1281e 100644
--- a/src/engine/events/CreatePatch.hpp
+++ b/src/engine/events/CreatePatch.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef CREATEPATCHEVENT_H
-#define CREATEPATCHEVENT_H
+#ifndef INGEN_EVENTS_CREATEPATCH_HPP
+#define INGEN_EVENTS_CREATEPATCH_HPP
 
 #include "QueuedEvent.hpp"
 #include "interface/Resource.hpp"
@@ -66,4 +66,4 @@ private:
 } // namespace Events
 
 
-#endif // CREATEPATCHEVENT_H
+#endif // INGEN_EVENTS_CREATEPATCH_HPP
diff --git a/src/engine/events/CreatePort.hpp b/src/engine/events/CreatePort.hpp
index adda30bb..ad8ab5bf 100644
--- a/src/engine/events/CreatePort.hpp
+++ b/src/engine/events/CreatePort.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef CREATEPORTEVENT_H
-#define CREATEPORTEVENT_H
+#ifndef INGEN_EVENTS_CREATEPORT_HPP
+#define INGEN_EVENTS_CREATEPORT_HPP
 
 #include "QueuedEvent.hpp"
 #include "raul/Path.hpp"
@@ -79,4 +79,4 @@ private:
 } // namespace Ingen
 } // namespace Events
 
-#endif // CREATEPORTEVENT_H
+#endif // INGEN_EVENTS_CREATEPORT_HPP
diff --git a/src/engine/events/Deactivate.hpp b/src/engine/events/Deactivate.hpp
index 05d87520..609430d9 100644
--- a/src/engine/events/Deactivate.hpp
+++ b/src/engine/events/Deactivate.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef DEACTIVATEEVENT_H
-#define DEACTIVATEEVENT_H
+#ifndef INGEN_EVENTS_DEACTIVATE_HPP
+#define INGEN_EVENTS_DEACTIVATE_HPP
 
 #include "QueuedEvent.hpp"
 #include "Engine.hpp"
@@ -46,4 +46,4 @@ public:
 } // namespace Ingen
 } // namespace Events
 
-#endif // DEACTIVATEEVENT_H
+#endif // INGEN_EVENTS_DEACTIVATE_HPP
diff --git a/src/engine/events/Delete.hpp b/src/engine/events/Delete.hpp
index e4cb6732..8ad8ac12 100644
--- a/src/engine/events/Delete.hpp
+++ b/src/engine/events/Delete.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef DESTROYEVENT_H
-#define DESTROYEVENT_H
+#ifndef INGEN_EVENTS_DELETE_HPP
+#define INGEN_EVENTS_DELETE_HPP
 
 #include "QueuedEvent.hpp"
 #include "EngineStore.hpp"
@@ -92,4 +92,4 @@ private:
 } // namespace Ingen
 } // namespace Events
 
-#endif // DESTROYEVENT_H
+#endif // INGEN_EVENTS_DELETE_HPP
diff --git a/src/engine/events/Disconnect.hpp b/src/engine/events/Disconnect.hpp
index 652fd4b5..e118143c 100644
--- a/src/engine/events/Disconnect.hpp
+++ b/src/engine/events/Disconnect.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef DISCONNECTIONEVENT_H
-#define DISCONNECTIONEVENT_H
+#ifndef INGEN_EVENTS_DISCONNECT_HPP
+#define INGEN_EVENTS_DISCONNECT_HPP
 
 #include "raul/Path.hpp"
 #include "QueuedEvent.hpp"
@@ -99,4 +99,4 @@ private:
 } // namespace Ingen
 } // namespace Events
 
-#endif // DISCONNECTIONEVENT_H
+#endif // INGEN_EVENTS_DISCONNECT_HPP
diff --git a/src/engine/events/DisconnectAll.hpp b/src/engine/events/DisconnectAll.hpp
index 8cb3f9a2..d350e889 100644
--- a/src/engine/events/DisconnectAll.hpp
+++ b/src/engine/events/DisconnectAll.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef DISCONNECTNODEEVENT_H
-#define DISCONNECTNODEEVENT_H
+#ifndef INGEN_EVENTS_DISCONNECTALL_HPP
+#define INGEN_EVENTS_DISCONNECTALL_HPP
 
 #include "raul/List.hpp"
 #include "raul/Path.hpp"
@@ -87,4 +87,4 @@ private:
 } // namespace Events
 
 
-#endif // DISCONNECTNODEEVENT_H
+#endif // INGEN_EVENTS_DISCONNECTALL_HPP
diff --git a/src/engine/events/Get.hpp b/src/engine/events/Get.hpp
index 81d86b25..5054ddb5 100644
--- a/src/engine/events/Get.hpp
+++ b/src/engine/events/Get.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef REQUESTOBJECTEVENT_H
-#define REQUESTOBJECTEVENT_H
+#ifndef INGEN_EVENTS_GET_HPP
+#define INGEN_EVENTS_GET_HPP
 
 #include "QueuedEvent.hpp"
 #include "types.hpp"
@@ -56,4 +56,4 @@ private:
 } // namespace Ingen
 } // namespace Events
 
-#endif // REQUESTOBJECTEVENT_H
+#endif // INGEN_EVENTS_GET_HPP
diff --git a/src/engine/events/Learn.hpp b/src/engine/events/Learn.hpp
index 8eb61c5f..5f548797 100644
--- a/src/engine/events/Learn.hpp
+++ b/src/engine/events/Learn.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef MIDILEARNEVENT_H
-#define MIDILEARNEVENT_H
+#ifndef INGEN_EVENTS_LEARN_HPP
+#define INGEN_EVENTS_LEARN_HPP
 
 #include "QueuedEvent.hpp"
 #include "internals/Controller.hpp"
@@ -58,4 +58,4 @@ private:
 } // namespace Ingen
 } // namespace Events
 
-#endif // MIDILEARNEVENT_H
+#endif // INGEN_EVENTS_LEARN_HPP
diff --git a/src/engine/events/LoadPlugins.hpp b/src/engine/events/LoadPlugins.hpp
index 3549fdfd..dcc5cd52 100644
--- a/src/engine/events/LoadPlugins.hpp
+++ b/src/engine/events/LoadPlugins.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef LOADPLUGINSEVENT_H
-#define LOADPLUGINSEVENT_H
+#ifndef INGEN_EVENTS_LOADPLUGINS_HPP
+#define INGEN_EVENTS_LOADPLUGINS_HPP
 
 #include "QueuedEvent.hpp"
 
@@ -44,4 +44,4 @@ public:
 } // namespace Ingen
 } // namespace Events
 
-#endif // LOADPLUGINSEVENT_H
+#endif // INGEN_EVENTS_LOADPLUGINS_HPP
diff --git a/src/engine/events/Move.hpp b/src/engine/events/Move.hpp
index 7effaae0..5a982397 100644
--- a/src/engine/events/Move.hpp
+++ b/src/engine/events/Move.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef RENAMEEVENT_H
-#define RENAMEEVENT_H
+#ifndef INGEN_EVENTS_MOVE_HPP
+#define INGEN_EVENTS_MOVE_HPP
 
 #include "raul/Path.hpp"
 #include "QueuedEvent.hpp"
@@ -77,4 +77,4 @@ private:
 } // namespace Ingen
 } // namespace Events
 
-#endif // RENAMEEVENT_H
+#endif // INGEN_EVENTS_MOVE_HPP
diff --git a/src/engine/events/Note.hpp b/src/engine/events/Note.hpp
index 9d895652..418e9130 100644
--- a/src/engine/events/Note.hpp
+++ b/src/engine/events/Note.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef NOTEEVENT_H
-#define NOTEEVENT_H
+#ifndef INGEN_EVENTS_NOTE_HPP
+#define INGEN_EVENTS_NOTE_HPP
 
 #include "Event.hpp"
 #include "types.hpp"
@@ -66,4 +66,4 @@ private:
 } // namespace Ingen
 } // namespace Events
 
-#endif // NOTEEVENT_H
+#endif // INGEN_EVENTS_NOTE_HPP
diff --git a/src/engine/events/Ping.hpp b/src/engine/events/Ping.hpp
index 8a8b554d..f7359efc 100644
--- a/src/engine/events/Ping.hpp
+++ b/src/engine/events/Ping.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef PINGQUEUEDEVENT_H
-#define PINGQUEUEDEVENT_H
+#ifndef INGEN_EVENTS_PING_HPP
+#define INGEN_EVENTS_PING_HPP
 
 #include "QueuedEvent.hpp"
 #include "types.hpp"
@@ -48,4 +48,4 @@ public:
 } // namespace Ingen
 } // namespace Events
 
-#endif // PINGQUEUEDEVENT_H
+#endif // INGEN_EVENTS_PING_HPP
diff --git a/src/engine/events/RegisterClient.hpp b/src/engine/events/RegisterClient.hpp
index 92c62cc7..baecdc4d 100644
--- a/src/engine/events/RegisterClient.hpp
+++ b/src/engine/events/RegisterClient.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef REGISTERCLIENTEVENT_H
-#define REGISTERCLIENTEVENT_H
+#ifndef INGEN_EVENTS_REGISTERCLIENT_HPP
+#define INGEN_EVENTS_REGISTERCLIENT_HPP
 
 #include "raul/URI.hpp"
 #include "interface/ClientInterface.hpp"
@@ -51,4 +51,4 @@ private:
 } // namespace Ingen
 } // namespace Events
 
-#endif // REGISTERCLIENTEVENT_H
+#endif // INGEN_EVENTS_REGISTERCLIENT_HPP
diff --git a/src/engine/events/RequestAllObjects.hpp b/src/engine/events/RequestAllObjects.hpp
index 1499a83c..3b44c5c0 100644
--- a/src/engine/events/RequestAllObjects.hpp
+++ b/src/engine/events/RequestAllObjects.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef REQUESTALLOBJECTSEVENT_H
-#define REQUESTALLOBJECTSEVENT_H
+#ifndef INGEN_EVENTS_REQUESTALLOBJECTS_HPP
+#define INGEN_EVENTS_REQUESTALLOBJECTS_HPP
 
 #include "QueuedEvent.hpp"
 
@@ -41,4 +41,4 @@ public:
 } // namespace Ingen
 } // namespace Events
 
-#endif // REQUESTALLOBJECTSEVENT_H
+#endif // INGEN_EVENTS_REQUESTALLOBJECTS_HPP
diff --git a/src/engine/events/RequestMetadata.hpp b/src/engine/events/RequestMetadata.hpp
index 0777c79a..68da6adc 100644
--- a/src/engine/events/RequestMetadata.hpp
+++ b/src/engine/events/RequestMetadata.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef REQUESTMETADATAEVENT_H
-#define REQUESTMETADATAEVENT_H
+#ifndef INGEN_EVENTS_REQUESTMETADATA_HPP
+#define INGEN_EVENTS_REQUESTMETADATA_HPP
 
 #include "QueuedEvent.hpp"
 #include "raul/Atom.hpp"
@@ -73,4 +73,4 @@ private:
 } // namespace Ingen
 } // namespace Events
 
-#endif // REQUESTMETADATAEVENT_H
+#endif // INGEN_EVENTS_REQUESTMETADATA_HPP
diff --git a/src/engine/events/RequestPlugins.hpp b/src/engine/events/RequestPlugins.hpp
index 16f878db..e4372bc6 100644
--- a/src/engine/events/RequestPlugins.hpp
+++ b/src/engine/events/RequestPlugins.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef REQUESTPLUGINSEVENT_H
-#define REQUESTPLUGINSEVENT_H
+#ifndef INGEN_EVENTS_REQUESTPLUGINS_HPP
+#define INGEN_EVENTS_REQUESTPLUGINS_HPP
 
 #include "QueuedEvent.hpp"
 #include "NodeFactory.hpp"
@@ -48,4 +48,4 @@ private:
 } // namespace Ingen
 } // namespace Events
 
-#endif // REQUESTPLUGINSEVENT_H
+#endif // INGEN_EVENTS_REQUESTPLUGINS_HPP
diff --git a/src/engine/events/SendBinding.hpp b/src/engine/events/SendBinding.hpp
index 303e29fa..7cce3767 100644
--- a/src/engine/events/SendBinding.hpp
+++ b/src/engine/events/SendBinding.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef SENDBINDINGEVENT_H
-#define SENDBINDINGEVENT_H
+#ifndef INGEN_EVENTS_SENDBINDING_HPP
+#define INGEN_EVENTS_SENDBINDING_HPP
 
 #include "raul/Atom.hpp"
 #include "interface/MessageType.hpp"
@@ -65,4 +65,4 @@ private:
 } // namespace Ingen
 } // namespace Events
 
-#endif // SENDBINDINGEVENT_H
+#endif // INGEN_EVENTS_SENDBINDING_HPP
diff --git a/src/engine/events/SendPortActivity.hpp b/src/engine/events/SendPortActivity.hpp
index c35266c5..2e1c40f2 100644
--- a/src/engine/events/SendPortActivity.hpp
+++ b/src/engine/events/SendPortActivity.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef SENDPORTACTIVITYEVENT_H
-#define SENDPORTACTIVITYEVENT_H
+#ifndef INGEN_EVENTS_SENDPORTACTIVITY_HPP
+#define INGEN_EVENTS_SENDPORTACTIVITY_HPP
 
 #include "Event.hpp"
 #include "types.hpp"
@@ -65,4 +65,4 @@ private:
 } // namespace Ingen
 } // namespace Events
 
-#endif // SENDPORTACTIVITYEVENT_H
+#endif // INGEN_EVENTS_SENDPORTACTIVITY_HPP
diff --git a/src/engine/events/SendPortValue.hpp b/src/engine/events/SendPortValue.hpp
index b942398c..a106f459 100644
--- a/src/engine/events/SendPortValue.hpp
+++ b/src/engine/events/SendPortValue.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef SENDPORTVALUEEVENT_H
-#define SENDPORTVALUEEVENT_H
+#ifndef INGEN_EVENTS_SENDPORTVALUE_HPP
+#define INGEN_EVENTS_SENDPORTVALUE_HPP
 
 #include "raul/Atom.hpp"
 #include "engine/Event.hpp"
@@ -78,4 +78,4 @@ private:
 } // namespace Ingen
 } // namespace Events
 
-#endif // SENDPORTVALUEEVENT_H
+#endif // INGEN_EVENTS_SENDPORTVALUE_HPP
diff --git a/src/engine/events/SetMetadata.hpp b/src/engine/events/SetMetadata.hpp
index 1417e02c..cf49efae 100644
--- a/src/engine/events/SetMetadata.hpp
+++ b/src/engine/events/SetMetadata.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef SETMETADATAEVENT_H
-#define SETMETADATAEVENT_H
+#ifndef INGEN_EVENTS_SETMETADATA_HPP
+#define INGEN_EVENTS_SETMETADATA_HPP
 
 #include <vector>
 #include "raul/URI.hpp"
@@ -117,4 +117,4 @@ private:
 } // namespace Ingen
 } // namespace Events
 
-#endif // SETMETADATAEVENT_H
+#endif // INGEN_EVENTS_SETMETADATA_HPP
diff --git a/src/engine/events/SetPortValue.hpp b/src/engine/events/SetPortValue.hpp
index aab59811..821672fd 100644
--- a/src/engine/events/SetPortValue.hpp
+++ b/src/engine/events/SetPortValue.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef SETPORTVALUEEVENT_H
-#define SETPORTVALUEEVENT_H
+#ifndef INGEN_EVENTS_SETPORTVALUE_HPP
+#define INGEN_EVENTS_SETPORTVALUE_HPP
 
 #include "raul/Atom.hpp"
 #include "QueuedEvent.hpp"
@@ -92,4 +92,4 @@ private:
 } // namespace Ingen
 } // namespace Events
 
-#endif // SETPORTVALUEEVENT_H
+#endif // INGEN_EVENTS_SETPORTVALUE_HPP
diff --git a/src/engine/events/UnregisterClient.hpp b/src/engine/events/UnregisterClient.hpp
index 9b6f9ab1..e32f8a94 100644
--- a/src/engine/events/UnregisterClient.hpp
+++ b/src/engine/events/UnregisterClient.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef UNREGISTERCLIENTEVENT_H
-#define UNREGISTERCLIENTEVENT_H
+#ifndef INGEN_EVENTS_UNREGISTERCLIENT_HPP
+#define INGEN_EVENTS_UNREGISTERCLIENT_HPP
 
 #include "QueuedEvent.hpp"
 #include "raul/URI.hpp"
@@ -47,4 +47,4 @@ private:
 } // namespace Ingen
 } // namespace Events
 
-#endif // UNREGISTERCLIENTEVENT_H
+#endif // INGEN_EVENTS_UNREGISTERCLIENT_HPP
diff --git a/src/engine/internals/Controller.hpp b/src/engine/internals/Controller.hpp
index bca26ed5..35824f52 100644
--- a/src/engine/internals/Controller.hpp
+++ b/src/engine/internals/Controller.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef MIDICONTROLNODE_H
-#define MIDICONTROLNODE_H
+#ifndef INGEN_INTERNALS_CONTROLLER_HPP
+#define INGEN_INTERNALS_CONTROLLER_HPP
 
 #include <string>
 #include "NodeBase.hpp"
@@ -62,4 +62,4 @@ private:
 } // namespace Ingen
 } // namespace Internals
 
-#endif // MIDICONTROLNODE_H
+#endif // INGEN_INTERNALS_CONTROLLER_HPP
diff --git a/src/engine/internals/Note.hpp b/src/engine/internals/Note.hpp
index 7f091231..45bb084f 100644
--- a/src/engine/internals/Note.hpp
+++ b/src/engine/internals/Note.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef MIDINOTENODE_H
-#define MIDINOTENODE_H
+#ifndef INGEN_INTERNALS_NOTE_HPP
+#define INGEN_INTERNALS_NOTE_HPP
 
 #include <string>
 #include "types.hpp"
@@ -88,4 +88,4 @@ private:
 } // namespace Ingen
 } // namespace Internals
 
-#endif // MIDINOTENODE_H
+#endif // INGEN_INTERNALS_NOTE_HPP
diff --git a/src/engine/internals/Trigger.hpp b/src/engine/internals/Trigger.hpp
index 84281ac7..dcc69b92 100644
--- a/src/engine/internals/Trigger.hpp
+++ b/src/engine/internals/Trigger.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef MIDITRIGGERNODE_H
-#define MIDITRIGGERNODE_H
+#ifndef INGEN_INTERNALS_TRIGGER_HPP
+#define INGEN_INTERNALS_TRIGGER_HPP
 
 #include <string>
 #include "NodeBase.hpp"
@@ -65,4 +65,4 @@ private:
 } // namespace Ingen
 } // namespace Internals
 
-#endif // MIDITRIGGERNODE_H
+#endif // INGEN_INTERNALS_TRIGGER_HPP
diff --git a/src/engine/mix.hpp b/src/engine/mix.hpp
index 792e4e94..ad12bad0 100644
--- a/src/engine/mix.hpp
+++ b/src/engine/mix.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef MIX_HPP
-#define MIX_HPP
+#ifndef INGEN_ENGINE_MIX_HPP
+#define INGEN_ENGINE_MIX_HPP
 
 #include "raul/log.hpp"
 #include "interface/PortType.hpp"
@@ -83,4 +83,4 @@ mix(Context& context, Buffer* dst, const Buffer*const* srcs, uint32_t num_srcs)
 
 } // namespace Ingen
 
-#endif // MIX_HPP
+#endif // INGEN_ENGINE_MIX_HPP
diff --git a/src/engine/tuning.hpp b/src/engine/tuning.hpp
index 1ddaf71a..70538c25 100644
--- a/src/engine/tuning.hpp
+++ b/src/engine/tuning.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef TUNING_H
-#define TUNING_H
+#ifndef INGEN_ENGINE_TUNING_HPP
+#define INGEN_ENGINE_TUNING_HPP
 
 #include <stddef.h>
 #include <time.h>
@@ -37,4 +37,4 @@ static const timespec main_rate       = { 0, 125000000 }; // 1/8 second
 
 } // namespace Ingen
 
-#endif // TUNING_H
+#endif // INGEN_ENGINE_TUNING_HPP
diff --git a/src/engine/types.hpp b/src/engine/types.hpp
index e1c8df0b..65c4fb95 100644
--- a/src/engine/types.hpp
+++ b/src/engine/types.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef TYPES_HPP
-#define TYPES_HPP
+#ifndef INGEN_ENGINE_TYPES_HPP
+#define INGEN_ENGINE_TYPES_HPP
 
 #include <stdint.h>
 #include <cstddef>
@@ -26,4 +26,4 @@ typedef uint32_t SampleCount;
 typedef uint32_t SampleRate;
 typedef uint32_t FrameTime;
 
-#endif // TYPES_HPP
+#endif // INGEN_ENGINE_TYPES_HPP
diff --git a/src/engine/util.hpp b/src/engine/util.hpp
index 3b9d436c..42acdb17 100644
--- a/src/engine/util.hpp
+++ b/src/engine/util.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef UTIL_HPP
-#define UTIL_HPP
+#ifndef INGEN_ENGINE_UTIL_HPP
+#define INGEN_ENGINE_UTIL_HPP
 
 #include <cstdlib>
 #include "raul/log.hpp"
@@ -82,4 +82,4 @@ ingen_jack_port_name(const Raul::Path& path)
 
 } // namespace Ingen
 
-#endif // UTIL_HPP
+#endif // INGEN_ENGINE_UTIL_HPP