Use consistent and more globally unique inclusion guards.

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

33 files changed, 99 insertions, 100 deletions

diff --git a/src/gui/App.hpp b/src/gui/App.hpp
index 5153849b..0de1a7ea 100644
--- a/src/gui/App.hpp
+++ b/src/gui/App.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef INGEN_APP_HPP
-#define INGEN_APP_HPP
+#ifndef INGEN_GUI_APP_HPP
+#define INGEN_GUI_APP_HPP
 
 #include <cassert>
 #include <string>
@@ -166,5 +166,5 @@ protected:
 } // namespace GUI
 } // namespace Ingen
 
-#endif // INGEN_APP_HPP
+#endif // INGEN_GUI_APP_HPP
 
diff --git a/src/gui/BreadCrumbs.hpp b/src/gui/BreadCrumbs.hpp
index adabe88f..492a634b 100644
--- a/src/gui/BreadCrumbs.hpp
+++ b/src/gui/BreadCrumbs.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef BREADCRUMBBOX_H
-#define BREADCRUMBBOX_H
+#ifndef INGEN_GUI_BREADCRUMBS_HPP
+#define INGEN_GUI_BREADCRUMBS_HPP
 
 #include <list>
 #include <gtkmm.h>
@@ -112,4 +112,4 @@ private:
 } // namespace GUI
 } // namespace Ingen
 
-#endif // BREADCRUMBBOX_H
+#endif // INGEN_GUI_BREADCRUMBS_HPP
diff --git a/src/gui/Configuration.hpp b/src/gui/Configuration.hpp
index fef86999..51e68a24 100644
--- a/src/gui/Configuration.hpp
+++ b/src/gui/Configuration.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef CONFIG_H
-#define CONFIG_H
+#ifndef INGEN_GUI_CONFIGURATION_HPP
+#define INGEN_GUI_CONFIGURATION_HPP
 
 #include <stdint.h>
 #include <string>
@@ -75,6 +75,6 @@ private:
 } // namespace GUI
 } // namespace Ingen
 
-#endif // CONFIG_H
+#endif // INGEN_GUI_CONFIGURATION_HPP
 
 
diff --git a/src/gui/ConnectWindow.hpp b/src/gui/ConnectWindow.hpp
index 3c2136af..05393a1e 100644
--- a/src/gui/ConnectWindow.hpp
+++ b/src/gui/ConnectWindow.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef CONNECT_WINDOW_H
-#define CONNECT_WINDOW_H
+#ifndef INGEN_GUI_CONNECTWINDOW_HPP
+#define INGEN_GUI_CONNECTWINDOW_HPP
 
 #include "ingen-config.h"
 
@@ -109,4 +109,4 @@ private:
 } // namespace GUI
 } // namespace Ingen
 
-#endif // CONNECT_WINDOW_H
+#endif // INGEN_GUI_CONNECTWINDOW_HPP
diff --git a/src/gui/Connection.hpp b/src/gui/Connection.hpp
index e9d5aa3c..43899aec 100644
--- a/src/gui/Connection.hpp
+++ b/src/gui/Connection.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef GUI_CONNECTION_H
-#define GUI_CONNECTION_H
+#ifndef INGEN_GUI_CONNECTION_HPP
+#define INGEN_GUI_CONNECTION_HPP
 
 #include <cassert>
 #include <string>
@@ -54,4 +54,4 @@ private:
 } // namespace GUI
 } // namespace Ingen
 
-#endif // GUI_CONNECTION_H
+#endif // INGEN_GUI_CONNECTION_HPP
diff --git a/src/gui/ControlPanel.hpp b/src/gui/ControlPanel.hpp
index 024bd720..93110cfa 100644
--- a/src/gui/ControlPanel.hpp
+++ b/src/gui/ControlPanel.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef CONTROLPANEL_H
-#define CONTROLPANEL_H
+#ifndef INGEN_GUI_CONTROLPANEL_HPP
+#define INGEN_GUI_CONTROLPANEL_HPP
 
 #include <vector>
 #include <string>
@@ -95,4 +95,4 @@ private:
 } // namespace GUI
 } // namespace Ingen
 
-#endif // CONTROLPANEL_H
+#endif // INGEN_GUI_CONTROLPANEL_HPP
diff --git a/src/gui/Controls.hpp b/src/gui/Controls.hpp
index 1a5ee46d..2996b177 100644
--- a/src/gui/Controls.hpp
+++ b/src/gui/Controls.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef CONTROLGROUPS_H
-#define CONTROLGROUPS_H
+#ifndef INGEN_GUI_CONTROLS_HPP
+#define INGEN_GUI_CONTROLS_HPP
 
 #include <cassert>
 #include <gtkmm.h>
@@ -142,4 +142,4 @@ private:
 } // namespace GUI
 } // namespace Ingen
 
-#endif // CONTROLGROUPS_H
+#endif // INGEN_GUI_CONTROLS_HPP
diff --git a/src/gui/GladeFactory.hpp b/src/gui/GladeFactory.hpp
index d666301d..f9801223 100644
--- a/src/gui/GladeFactory.hpp
+++ b/src/gui/GladeFactory.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef GLADEFACTORY_H
-#define GLADEFACTORY_H
+#ifndef INGEN_GUI_GLADEFACTORY_HPP
+#define INGEN_GUI_GLADEFACTORY_HPP
 
 #include <string>
 #include <libglademm/xml.h>
@@ -44,4 +44,4 @@ private:
 } // namespace GUI
 } // namespace Ingen
 
-#endif // GLADEFACTORY_H
+#endif // INGEN_GUI_GLADEFACTORY_HPP
diff --git a/src/gui/LoadPatchWindow.hpp b/src/gui/LoadPatchWindow.hpp
index df0c982d..a3356de6 100644
--- a/src/gui/LoadPatchWindow.hpp
+++ b/src/gui/LoadPatchWindow.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef LOADPATCHWINDOW_H
-#define LOADPATCHWINDOW_H
+#ifndef INGEN_GUI_LOADPATCHWINDOW_HPP
+#define INGEN_GUI_LOADPATCHWINDOW_HPP
 
 #include <libglademm/xml.h>
 #include <gtkmm.h>
@@ -83,4 +83,4 @@ private:
 } // namespace GUI
 } // namespace Ingen
 
-#endif // LOADPATCHWINDOW_H
+#endif // INGEN_GUI_LOADPATCHWINDOW_HPP
diff --git a/src/gui/LoadPluginWindow.hpp b/src/gui/LoadPluginWindow.hpp
index 9f24d278..3ff1b724 100644
--- a/src/gui/LoadPluginWindow.hpp
+++ b/src/gui/LoadPluginWindow.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef LOADPLUGINWINDOW_H
-#define LOADPLUGINWINDOW_H
+#ifndef INGEN_GUI_LOADPLUGINWINDOW_HPP
+#define INGEN_GUI_LOADPLUGINWINDOW_HPP
 
 #include <map>
 #include <libglademm/xml.h>
@@ -146,4 +146,4 @@ private:
 } // namespace GUI
 } // namespace Ingen
 
-#endif // LOADPLUGINWINDOW_H
+#endif // INGEN_GUI_LOADPLUGINWINDOW_HPP
diff --git a/src/gui/LoadRemotePatchWindow.hpp b/src/gui/LoadRemotePatchWindow.hpp
index ded08e6b..6c1a17d1 100644
--- a/src/gui/LoadRemotePatchWindow.hpp
+++ b/src/gui/LoadRemotePatchWindow.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef LOADREMOTEPATCHWINDOW_H
-#define LOADREMOTEPATCHWINDOW_H
+#ifndef INGEN_GUI_LOADREMOTEPATCHWINDOW_HPP
+#define INGEN_GUI_LOADREMOTEPATCHWINDOW_HPP
 
 #include <libglademm/xml.h>
 #include <gtkmm.h>
@@ -89,4 +89,4 @@ private:
 } // namespace GUI
 } // namespace Ingen
 
-#endif // LOADREMOTEPATCHWINDOW_H
+#endif // INGEN_GUI_LOADREMOTEPATCHWINDOW_HPP
diff --git a/src/gui/LoadSubpatchWindow.hpp b/src/gui/LoadSubpatchWindow.hpp
index 7473811f..6f71642b 100644
--- a/src/gui/LoadSubpatchWindow.hpp
+++ b/src/gui/LoadSubpatchWindow.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef LOADSUBPATCHWINDOW_H
-#define LOADSUBPATCHWINDOW_H
+#ifndef INGEN_GUI_LOADSUBPATCHWINDOW_HPP
+#define INGEN_GUI_LOADSUBPATCHWINDOW_HPP
 
 #include <libglademm/xml.h>
 #include <gtkmm.h>
@@ -78,4 +78,4 @@ private:
 } // namespace GUI
 } // namespace Ingen
 
-#endif // LOADSUBPATCHWINDOW_H
+#endif // INGEN_GUI_LOADSUBPATCHWINDOW_HPP
diff --git a/src/gui/MessagesWindow.hpp b/src/gui/MessagesWindow.hpp
index eac20df3..33c0a9af 100644
--- a/src/gui/MessagesWindow.hpp
+++ b/src/gui/MessagesWindow.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef MESSAGESWINDOW_H
-#define MESSAGESWINDOW_H
+#ifndef INGEN_GUI_MESSAGESWINDOW_HPP
+#define INGEN_GUI_MESSAGESWINDOW_HPP
 
 #include <string>
 #include <gtkmm.h>
@@ -53,4 +53,4 @@ private:
 } // namespace GUI
 } // namespace Ingen
 
-#endif // MESSAGESWINDOW_H
+#endif // INGEN_GUI_MESSAGESWINDOW_HPP
diff --git a/src/gui/NewSubpatchWindow.hpp b/src/gui/NewSubpatchWindow.hpp
index 5f493582..1b227c1e 100644
--- a/src/gui/NewSubpatchWindow.hpp
+++ b/src/gui/NewSubpatchWindow.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef NEWSUBPATCHWINDOW_H
-#define NEWSUBPATCHWINDOW_H
+#ifndef INGEN_GUI_NEWSUBPATCHWINDOW_HPP
+#define INGEN_GUI_NEWSUBPATCHWINDOW_HPP
 
 #include <libglademm/xml.h>
 #include <gtkmm.h>
@@ -68,4 +68,4 @@ private:
 } // namespace GUI
 } // namespace Ingen
 
-#endif // NEWSUBPATCHWINDOW_H
+#endif // INGEN_GUI_NEWSUBPATCHWINDOW_HPP
diff --git a/src/gui/NodeControlWindow.hpp b/src/gui/NodeControlWindow.hpp
index e8c1c064..10f517ad 100644
--- a/src/gui/NodeControlWindow.hpp
+++ b/src/gui/NodeControlWindow.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef NODECONTROLWINDOW_H
-#define NODECONTROLWINDOW_H
+#ifndef INGEN_GUI_NODECONTROLWINDOW_HPP
+#define INGEN_GUI_NODECONTROLWINDOW_HPP
 
 #include <gtkmm.h>
 #include <libglademm.h>
@@ -71,4 +71,4 @@ private:
 } // namespace GUI
 } // namespace Ingen
 
-#endif // NODECONTROLWINDOW_H
+#endif // INGEN_GUI_NODECONTROLWINDOW_HPP
diff --git a/src/gui/NodeMenu.hpp b/src/gui/NodeMenu.hpp
index dc9c2cfe..7d2be982 100644
--- a/src/gui/NodeMenu.hpp
+++ b/src/gui/NodeMenu.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef NODEMENU_H
-#define NODEMENU_H
+#ifndef INGEN_GUI_NODEMENU_HPP
+#define INGEN_GUI_NODEMENU_HPP
 
 #include <string>
 #include <gtkmm.h>
@@ -66,4 +66,4 @@ protected:
 } // namespace GUI
 } // namespace Ingen
 
-#endif // NODEMENU_H
+#endif // INGEN_GUI_NODEMENU_HPP
diff --git a/src/gui/NodeModule.hpp b/src/gui/NodeModule.hpp
index 496d8867..08a396a1 100644
--- a/src/gui/NodeModule.hpp
+++ b/src/gui/NodeModule.hpp
@@ -14,8 +14,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef NODEMODULE_H
-#define NODEMODULE_H
+#ifndef INGEN_GUI_NODEMODULE_HPP
+#define INGEN_GUI_NODEMODULE_HPP
 
 #include <string>
 #include <libgnomecanvasmm.h>
@@ -98,4 +98,4 @@ protected:
 } // namespace GUI
 } // namespace Ingen
 
-#endif // NODEMODULE_H
+#endif // INGEN_GUI_NODEMODULE_HPP
diff --git a/src/gui/ObjectMenu.hpp b/src/gui/ObjectMenu.hpp
index a619c5e4..83857b2b 100644
--- a/src/gui/ObjectMenu.hpp
+++ b/src/gui/ObjectMenu.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef OBJECTMENU_H
-#define OBJECTMENU_H
+#ifndef INGEN_GUI_OBJECTMENU_HPP
+#define INGEN_GUI_OBJECTMENU_HPP
 
 #include <string>
 #include <gtkmm.h>
@@ -66,4 +66,4 @@ protected:
 } // namespace GUI
 } // namespace Ingen
 
-#endif // OBJECTMENU_H
+#endif // INGEN_GUI_OBJECTMENU_HPP
diff --git a/src/gui/PatchCanvas.hpp b/src/gui/PatchCanvas.hpp
index 41787929..12587c2b 100644
--- a/src/gui/PatchCanvas.hpp
+++ b/src/gui/PatchCanvas.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef PATCHCANVAS_H
-#define PATCHCANVAS_H
+#ifndef INGEN_GUI_PATCHCANVAS_HPP
+#define INGEN_GUI_PATCHCANVAS_HPP
 
 #include <string>
 #include <map>
@@ -170,4 +170,4 @@ private:
 } // namespace GUI
 } // namespace Ingen
 
-#endif // PATCHCANVAS_H
+#endif // INGEN_GUI_PATCHCANVAS_HPP
diff --git a/src/gui/PatchPortModule.hpp b/src/gui/PatchPortModule.hpp
index 060c3950..a5884b4b 100644
--- a/src/gui/PatchPortModule.hpp
+++ b/src/gui/PatchPortModule.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef PATCHPORTMODULE_H
-#define PATCHPORTMODULE_H
+#ifndef INGEN_GUI_PATCHPORTMODULE_HPP
+#define INGEN_GUI_PATCHPORTMODULE_HPP
 
 #include <string>
 #include <boost/enable_shared_from_this.hpp>
@@ -81,4 +81,4 @@ protected:
 } // namespace GUI
 } // namespace Ingen
 
-#endif // PATCHPORTMODULE_H
+#endif // INGEN_GUI_PATCHPORTMODULE_HPP
diff --git a/src/gui/PatchTreeWindow.hpp b/src/gui/PatchTreeWindow.hpp
index c745b07d..b4f6ec2f 100644
--- a/src/gui/PatchTreeWindow.hpp
+++ b/src/gui/PatchTreeWindow.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef PATCHTREEWINDOW_H
-#define PATCHTREEWINDOW_H
+#ifndef INGEN_GUI_PATCHTREEWINDOW_HPP
+#define INGEN_GUI_PATCHTREEWINDOW_HPP
 
 #include <gtkmm.h>
 #include <libglademm.h>
@@ -111,4 +111,4 @@ private:
 } // namespace GUI
 } // namespace Ingen
 
-#endif // PATCHTREEWINDOW_H
+#endif // INGEN_GUI_PATCHTREEWINDOW_HPP
diff --git a/src/gui/PatchView.hpp b/src/gui/PatchView.hpp
index ed713803..776cea48 100644
--- a/src/gui/PatchView.hpp
+++ b/src/gui/PatchView.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef PATCHVIEW_H
-#define PATCHVIEW_H
+#ifndef INGEN_GUI_PATCHVIEW_HPP
+#define INGEN_GUI_PATCHVIEW_HPP
 
 #include <string>
 #include <gtkmm.h>
@@ -109,4 +109,4 @@ private:
 } // namespace GUI
 } // namespace Ingen
 
-#endif // PATCHVIEW_H
+#endif // INGEN_GUI_PATCHVIEW_HPP
diff --git a/src/gui/PatchWindow.hpp b/src/gui/PatchWindow.hpp
index 0f10cd84..8fecd28f 100644
--- a/src/gui/PatchWindow.hpp
+++ b/src/gui/PatchWindow.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef PATCHWINDOW_H
-#define PATCHWINDOW_H
+#ifndef INGEN_GUI_PATCHWINDOW_HPP
+#define INGEN_GUI_PATCHWINDOW_HPP
 
 #include <gtkmm.h>
 #include <libglademm/xml.h>
@@ -160,4 +160,4 @@ private:
 } // namespace GUI
 } // namespace Ingen
 
-#endif // PATCHWINDOW_H
+#endif // INGEN_GUI_PATCHWINDOW_HPP
diff --git a/src/gui/Port.hpp b/src/gui/Port.hpp
index 2c79ec7c..ae105fb0 100644
--- a/src/gui/Port.hpp
+++ b/src/gui/Port.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef GUI_PORT_H
-#define GUI_PORT_H
+#ifndef INGEN_GUI_PORT_HPP
+#define INGEN_GUI_PORT_HPP
 
 #include <cassert>
 #include <string>
@@ -76,4 +76,4 @@ private:
 } // namespace GUI
 } // namespace Ingen
 
-#endif // GUI_PORT_H
+#endif // INGEN_GUI_PORT_HPP
diff --git a/src/gui/PortMenu.hpp b/src/gui/PortMenu.hpp
index 61ff1cc5..829cefbf 100644
--- a/src/gui/PortMenu.hpp
+++ b/src/gui/PortMenu.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef PORTMENU_H
-#define PORTMENU_H
+#ifndef INGEN_GUI_PORTMENU_HPP
+#define INGEN_GUI_PORTMENU_HPP
 
 #include <string>
 #include <gtkmm.h>
@@ -59,4 +59,4 @@ private:
 } // namespace GUI
 } // namespace Ingen
 
-#endif // PORTMENU_H
+#endif // INGEN_GUI_PORTMENU_HPP
diff --git a/src/gui/PortPropertiesWindow.hpp b/src/gui/PortPropertiesWindow.hpp
index b8e71209..56b1bc69 100644
--- a/src/gui/PortPropertiesWindow.hpp
+++ b/src/gui/PortPropertiesWindow.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef PORTPROPERTIESWINDOW_H
-#define PORTPROPERTIESWINDOW_H
+#ifndef INGEN_GUI_PORTPROPERTIESWINDOW_HPP
+#define INGEN_GUI_PORTPROPERTIESWINDOW_HPP
 
 #include <gtkmm.h>
 #include <libglademm.h>
@@ -65,4 +65,4 @@ private:
 } // namespace GUI
 } // namespace Ingen
 
-#endif // PORTPROPERTIESWINDOW_H
+#endif // INGEN_GUI_PORTPROPERTIESWINDOW_HPP
diff --git a/src/gui/PropertiesWindow.hpp b/src/gui/PropertiesWindow.hpp
index 2511e78a..e4c7b962 100644
--- a/src/gui/PropertiesWindow.hpp
+++ b/src/gui/PropertiesWindow.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef PROPERTIES_WINDOW_HPP
-#define PROPERTIES_WINDOW_HPP
+#ifndef INGEN_GUI_PROPERTIES_WINDOW_HPP
+#define INGEN_GUI_PROPERTIES_WINDOW_HPP
 
 #include <gtkmm.h>
 #include <libglademm.h>
@@ -96,4 +96,4 @@ private:
 } // namespace GUI
 } // namespace Ingen
 
-#endif // PROPERTIES_WINDOW_HPP
+#endif // INGEN_GUI_PROPERTIES_WINDOW_HPP
diff --git a/src/gui/RenameWindow.hpp b/src/gui/RenameWindow.hpp
index 360fc36f..b4c43442 100644
--- a/src/gui/RenameWindow.hpp
+++ b/src/gui/RenameWindow.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef RENAMEWINDOW_H
-#define RENAMEWINDOW_H
+#ifndef INGEN_GUI_RENAMEWINDOW_HPP
+#define INGEN_GUI_RENAMEWINDOW_HPP
 
 #include <gtkmm.h>
 #include <libglademm.h>
@@ -61,4 +61,4 @@ private:
 } // namespace GUI
 } // namespace Ingen
 
-#endif // RENAMEWINDOW_H
+#endif // INGEN_GUI_RENAMEWINDOW_HPP
diff --git a/src/gui/SubpatchModule.hpp b/src/gui/SubpatchModule.hpp
index cef2dfb6..1e48ccf7 100644
--- a/src/gui/SubpatchModule.hpp
+++ b/src/gui/SubpatchModule.hpp
@@ -15,9 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-
-#ifndef SUBPATCHMODULE_H
-#define SUBPATCHMODULE_H
+#ifndef INGEN_GUI_SUBPATCHMODULE_HPP
+#define INGEN_GUI_SUBPATCHMODULE_HPP
 
 #include <string>
 #include <libgnomecanvasmm.h>
@@ -66,4 +65,4 @@ protected:
 } // namespace GUI
 } // namespace Ingen
 
-#endif // SUBPATCHMODULE_H
+#endif // INGEN_GUI_SUBPATCHMODULE_HPP
diff --git a/src/gui/ThreadedLoader.hpp b/src/gui/ThreadedLoader.hpp
index be86c95b..f6b8d706 100644
--- a/src/gui/ThreadedLoader.hpp
+++ b/src/gui/ThreadedLoader.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef THREADEDLOADER_H
-#define THREADEDLOADER_H
+#ifndef INGEN_GUI_THREADEDLOADER_HPP
+#define INGEN_GUI_THREADEDLOADER_HPP
 
 #include <string>
 #include <list>
@@ -88,4 +88,4 @@ private:
 } // namespace GUI
 } // namespace Ingen
 
-#endif // LOADERRTHREAD_H
+#endif // INGEN_GUI_LOADERRTHREAD_HPP
diff --git a/src/gui/UploadPatchWindow.hpp b/src/gui/UploadPatchWindow.hpp
index 2c2d8aa9..cd583f19 100644
--- a/src/gui/UploadPatchWindow.hpp
+++ b/src/gui/UploadPatchWindow.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef UPLOADPATCHWINDOW_H
-#define UPLOADPATCHWINDOW_H
+#ifndef INGEN_GUI_UPLOADPATCHWINDOW_HPP
+#define INGEN_GUI_UPLOADPATCHWINDOW_HPP
 
 #include <sstream>
 #include <libglademm/xml.h>
@@ -104,4 +104,4 @@ private:
 } // namespace GUI
 } // namespace Ingen
 
-#endif // UPLOADPATCHWINDOW_H
+#endif // INGEN_GUI_UPLOADPATCHWINDOW_HPP
diff --git a/src/gui/Window.hpp b/src/gui/Window.hpp
index b8bc0047..48a9eb1b 100644
--- a/src/gui/Window.hpp
+++ b/src/gui/Window.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef WINDOW_HPP
-#define WINDOW_HPP
+#ifndef INGEN_GUI_WINDOW_HPP
+#define INGEN_GUI_WINDOW_HPP
 
 #include <gtkmm.h>
 #include <libglademm.h>
@@ -74,4 +74,4 @@ public:
 } // namespace GUI
 } // namespace Ingen
 
-#endif // WINDOW_HPP
+#endif // INGEN_GUI_WINDOW_HPP
diff --git a/src/gui/WindowFactory.hpp b/src/gui/WindowFactory.hpp
index adfd1c0d..8f205620 100644
--- a/src/gui/WindowFactory.hpp
+++ b/src/gui/WindowFactory.hpp
@@ -15,8 +15,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef WINDOW_FACTORY_H
-#define WINDOW_FACTORY_H
+#ifndef INGEN_GUI_WINDOWFACTORY_HPP
+#define INGEN_GUI_WINDOWFACTORY_HPP
 
 #include <map>
 #include <gtkmm.h>
@@ -113,4 +113,4 @@ private:
 } // namespace GUI
 } // namespace Ingen
 
-#endif // WINDOW_FACTORY_H
+#endif // INGEN_GUI_WINDOWFACTORY_HPP