Clean up include guards

10 files changed, 30 insertions, 30 deletions

diff --git a/include/ingen/Clock.hpp b/include/ingen/Clock.hpp
index 27d8443d..622dd4bf 100644
--- a/include/ingen/Clock.hpp
+++ b/include/ingen/Clock.hpp
@@ -14,8 +14,8 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef INGEN_ENGINE_CLOCK_HPP
-#define INGEN_ENGINE_CLOCK_HPP
+#ifndef INGEN_CLOCK_HPP
+#define INGEN_CLOCK_HPP
 
 #ifdef __MACH__
 #    include <mach/mach.h>
@@ -63,4 +63,4 @@ private:
 
 } // namespace ingen
 
-#endif // INGEN_ENGINE_CLOCK_HPP
+#endif // INGEN_CLOCK_HPP
diff --git a/include/ingen/DataAccess.hpp b/include/ingen/DataAccess.hpp
index 13b5ac47..acea8bd3 100644
--- a/include/ingen/DataAccess.hpp
+++ b/include/ingen/DataAccess.hpp
@@ -14,8 +14,8 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef INGEN_ENGINE_DATAACCESS_HPP
-#define INGEN_ENGINE_DATAACCESS_HPP
+#ifndef INGEN_DATAACCESS_HPP
+#define INGEN_DATAACCESS_HPP
 
 #include "ingen/LV2Features.hpp"
 #include "ingen/Node.hpp"
@@ -65,4 +65,4 @@ struct DataAccess : public ingen::LV2Features::Feature
 
 } // namespace ingen
 
-#endif // INGEN_ENGINE_DATAACCESS_HPP
+#endif // INGEN_DATAACCESS_HPP
diff --git a/include/ingen/FilePath.hpp b/include/ingen/FilePath.hpp
index 337553ef..c82b738d 100644
--- a/include/ingen/FilePath.hpp
+++ b/include/ingen/FilePath.hpp
@@ -14,8 +14,8 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef INGEN_FILE_PATH_HPP
-#define INGEN_FILE_PATH_HPP
+#ifndef INGEN_FILEPATH_HPP
+#define INGEN_FILEPATH_HPP
 
 #include "ingen/ingen.h"
 
@@ -122,4 +122,4 @@ operator<<(std::basic_ostream<Char, Traits>& os, const FilePath& path)
 
 } // namespace ingen
 
-#endif // INGEN_FILE_PATH_HPP
+#endif // INGEN_FILEPATH_HPP
diff --git a/include/ingen/InstanceAccess.hpp b/include/ingen/InstanceAccess.hpp
index 5d068ae1..782161f1 100644
--- a/include/ingen/InstanceAccess.hpp
+++ b/include/ingen/InstanceAccess.hpp
@@ -14,8 +14,8 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef INGEN_ENGINE_INSTANCEACCESS_HPP
-#define INGEN_ENGINE_INSTANCEACCESS_HPP
+#ifndef INGEN_INSTANCEACCESS_HPP
+#define INGEN_INSTANCEACCESS_HPP
 
 #include "ingen/LV2Features.hpp"
 #include "ingen/Node.hpp"
@@ -53,4 +53,4 @@ struct InstanceAccess : public ingen::LV2Features::Feature
 
 } // namespace ingen
 
-#endif // INGEN_ENGINE_INSTANCEACCESS_HPP
+#endif // INGEN_INSTANCEACCESS_HPP
diff --git a/include/ingen/QueuedInterface.hpp b/include/ingen/QueuedInterface.hpp
index f45dd3da..c54d2b01 100644
--- a/include/ingen/QueuedInterface.hpp
+++ b/include/ingen/QueuedInterface.hpp
@@ -14,8 +14,8 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef INGEN_ENGINE_QUEUEDINTERFACE_HPP
-#define INGEN_ENGINE_QUEUEDINTERFACE_HPP
+#ifndef INGEN_QUEUEDINTERFACE_HPP
+#define INGEN_QUEUEDINTERFACE_HPP
 
 #include "ingen/Interface.hpp"
 #include "ingen/Message.hpp"
@@ -63,4 +63,4 @@ private:
 
 } // namespace ingen
 
-#endif // INGEN_ENGINE_QUEUEDINTERFACE_HPP
+#endif // INGEN_QUEUEDINTERFACE_HPP
diff --git a/include/ingen/SocketReader.hpp b/include/ingen/SocketReader.hpp
index 22a0f4aa..85d1adc0 100644
--- a/include/ingen/SocketReader.hpp
+++ b/include/ingen/SocketReader.hpp
@@ -14,8 +14,8 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef INGEN_SOCKET_READER_HPP
-#define INGEN_SOCKET_READER_HPP
+#ifndef INGEN_SOCKETREADER_HPP
+#define INGEN_SOCKETREADER_HPP
 
 #include "ingen/ingen.h"
 #include "ingen/types.hpp"
@@ -82,4 +82,4 @@ private:
 
 }  // namespace ingen
 
-#endif  // INGEN_SOCKET_READER_HPP
+#endif  // INGEN_SOCKETREADER_HPP
diff --git a/include/ingen/SocketWriter.hpp b/include/ingen/SocketWriter.hpp
index 229f7b50..a5c651ef 100644
--- a/include/ingen/SocketWriter.hpp
+++ b/include/ingen/SocketWriter.hpp
@@ -14,8 +14,8 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef INGEN_SOCKET_WRITER_HPP
-#define INGEN_SOCKET_WRITER_HPP
+#ifndef INGEN_SOCKETWRITER_HPP
+#define INGEN_SOCKETWRITER_HPP
 
 #include "ingen/Message.hpp"
 #include "ingen/TurtleWriter.hpp"
@@ -54,4 +54,4 @@ protected:
 
 }  // namespace ingen
 
-#endif  // INGEN_SOCKET_WRITER_HPP
+#endif  // INGEN_SOCKETWRITER_HPP
diff --git a/include/ingen/Tee.hpp b/include/ingen/Tee.hpp
index b13b9e95..0a560f5c 100644
--- a/include/ingen/Tee.hpp
+++ b/include/ingen/Tee.hpp
@@ -14,8 +14,8 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef INGEN_ENGINE_TEE_HPP
-#define INGEN_ENGINE_TEE_HPP
+#ifndef INGEN_TEE_HPP
+#define INGEN_TEE_HPP
 
 #include "ingen/Interface.hpp"
 #include "ingen/Message.hpp"
@@ -60,4 +60,4 @@ private:
 
 } // namespace ingen
 
-#endif // INGEN_ENGINE_TEE_HPP
+#endif // INGEN_TEE_HPP
diff --git a/include/ingen/TurtleWriter.hpp b/include/ingen/TurtleWriter.hpp
index 9c88be2e..d9aa13d3 100644
--- a/include/ingen/TurtleWriter.hpp
+++ b/include/ingen/TurtleWriter.hpp
@@ -14,8 +14,8 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef INGEN_TURTLE_WRITER_HPP
-#define INGEN_TURTLE_WRITER_HPP
+#ifndef INGEN_TURTLEWRITER_HPP
+#define INGEN_TURTLEWRITER_HPP
 
 #include "ingen/AtomSink.hpp"
 #include "ingen/AtomWriter.hpp"
@@ -66,4 +66,4 @@ protected:
 
 }  // namespace ingen
 
-#endif  // INGEN_TURTLE_WRITER_HPP
+#endif  // INGEN_TURTLEWRITER_HPP
diff --git a/include/ingen/ingen.h b/include/ingen/ingen.h
index 05b9e7b2..ccdb5596 100644
--- a/include/ingen/ingen.h
+++ b/include/ingen/ingen.h
@@ -14,8 +14,8 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef INGEN_H
-#define INGEN_H
+#ifndef INGEN_INGEN_H
+#define INGEN_INGEN_H
 
 #ifdef INGEN_SHARED
 #    ifdef _WIN32
@@ -72,4 +72,4 @@
 #define INGEN__uiEmbedded      INGEN_NS "uiEmbedded"
 #define INGEN__value           INGEN_NS "value"
 
-#endif // INGEN_H
+#endif // INGEN_INGEN_H