diff --git a/distrho/extra/WebView.hpp b/distrho/extra/WebView.hpp
index 61a80a30..fdc65048 100644
--- a/distrho/extra/WebView.hpp
+++ b/distrho/extra/WebView.hpp
@@ -14,8 +14,8 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef DISTRHO_WEBVIEW_HPP_INCLUDED
-#define DISTRHO_WEBVIEW_HPP_INCLUDED
+#ifndef DISTRHO_WEB_VIEW_HPP_INCLUDED
+#define DISTRHO_WEB_VIEW_HPP_INCLUDED
 
 #include "../DistrhoUtils.hpp"
 
@@ -25,4 +25,4 @@ START_NAMESPACE_DISTRHO
 
 END_NAMESPACE_DISTRHO
 
-#endif // DISTRHO_WEBVIEW_HPP_INCLUDED
+#endif // DISTRHO_WEB_VIEW_HPP_INCLUDED
diff --git a/distrho/extra/WebViewImpl.cpp b/distrho/extra/WebViewImpl.cpp
index c5547f36..40506f97 100644
--- a/distrho/extra/WebViewImpl.cpp
+++ b/distrho/extra/WebViewImpl.cpp
@@ -926,4 +926,3 @@ END_NAMESPACE_DISTRHO
 
 #undef WEB_VIEW_DISTRHO_NAMESPACE
 #undef WEB_VIEW_DGL_NAMESPACE
-#undef WEB_VIEW_NAMESPACE
diff --git a/distrho/src/DistrhoUI.cpp b/distrho/src/DistrhoUI.cpp
index 0ec1112b..988660de 100644
--- a/distrho/src/DistrhoUI.cpp
+++ b/distrho/src/DistrhoUI.cpp
@@ -54,9 +54,9 @@ END_NAMESPACE_DISTRHO
 #endif
 
 #if DISTRHO_UI_USE_WEBVIEW && !defined(DISTRHO_OS_MAC)
-# define DISTRHO_WEBVIEW_HPP_INCLUDED
-# define WEBVIEW_NAMESPACE DISTRHO_NAMESPACE
-# define WEBVIEW_DISTRHO_NAMESPACE
+# define DISTRHO_WEB_VIEW_HPP_INCLUDED
+# define WEB_VIEW_NAMESPACE DISTRHO_NAMESPACE
+# define WEB_VIEW_DISTRHO_NAMESPACE
 START_NAMESPACE_DISTRHO
 # include "../extra/WebViewImpl.hpp"
 END_NAMESPACE_DISTRHO