4 files changed, 20 insertions, 20 deletions
diff --git a/bindings/cxx/include/pugl/pugl_cairo.hpp b/bindings/cxx/include/pugl/cairo.hpp
index 213c977..4df2702 100644
--- a/bindings/cxx/include/pugl/pugl_cairo.hpp
+++ b/bindings/cxx/include/pugl/cairo.hpp
@@ -15,15 +15,15 @@
 */
 
 /**
-   @file pugl_cairo.hpp
+   @file cairo.hpp
    @brief Declaration of Cairo backend accessor for C++.
 */
 
-#ifndef PUGL_PUGL_CAIRO_HPP
-#define PUGL_PUGL_CAIRO_HPP
+#ifndef PUGL_CAIRO_HPP
+#define PUGL_CAIRO_HPP
 
+#include "pugl/cairo.h"
 #include "pugl/pugl.h"
-#include "pugl/pugl_cairo.h"
 
 namespace pugl {
 
@@ -47,4 +47,4 @@ cairoBackend() noexcept
 
 } // namespace pugl
 
-#endif // PUGL_PUGL_CAIRO_HPP
+#endif // PUGL_CAIRO_HPP
diff --git a/bindings/cxx/include/pugl/pugl_gl.hpp b/bindings/cxx/include/pugl/gl.hpp
index b7c581e..2777cbf 100644
--- a/bindings/cxx/include/pugl/pugl_gl.hpp
+++ b/bindings/cxx/include/pugl/gl.hpp
@@ -15,15 +15,15 @@
 */
 
 /**
-   @file pugl_gl.hpp
+   @file gl.hpp
    @brief OpenGL-specific C++ API.
 */
 
-#ifndef PUGL_PUGL_GL_HPP
-#define PUGL_PUGL_GL_HPP
+#ifndef PUGL_GL_HPP
+#define PUGL_GL_HPP
 
+#include "pugl/gl.h"
 #include "pugl/pugl.h"
-#include "pugl/pugl_gl.h"
 
 namespace pugl {
 
@@ -57,4 +57,4 @@ glBackend() noexcept
 
 } // namespace pugl
 
-#endif // PUGL_PUGL_GL_HPP
+#endif // PUGL_GL_HPP
diff --git a/bindings/cxx/include/pugl/pugl_stub.hpp b/bindings/cxx/include/pugl/stub.hpp
index 362682b..74e8ef2 100644
--- a/bindings/cxx/include/pugl/pugl_stub.hpp
+++ b/bindings/cxx/include/pugl/stub.hpp
@@ -15,15 +15,15 @@
 */
 
 /**
-   @file pugl_stub.hpp
+   @file stub.hpp
    @brief Declaration of Stub backend accessor for C++.
 */
 
-#ifndef PUGL_PUGL_STUB_HPP
-#define PUGL_PUGL_STUB_HPP
+#ifndef PUGL_STUB_HPP
+#define PUGL_STUB_HPP
 
 #include "pugl/pugl.h"
-#include "pugl/pugl_stub.h"
+#include "pugl/stub.h"
 
 namespace pugl {
 
@@ -47,4 +47,4 @@ stubBackend() noexcept
 
 } // namespace pugl
 
-#endif // PUGL_PUGL_STUB_HPP
+#endif // PUGL_STUB_HPP
diff --git a/bindings/cxx/include/pugl/pugl_vulkan.hpp b/bindings/cxx/include/pugl/vulkan.hpp
index 9241aba..a7b16cb 100644
--- a/bindings/cxx/include/pugl/pugl_vulkan.hpp
+++ b/bindings/cxx/include/pugl/vulkan.hpp
@@ -15,19 +15,19 @@
 */
 
 /**
-   @file pugl_vulkan.hpp Vulkan-specific C++ API.
+   @file vulkan.hpp Vulkan-specific C++ API.
 
    Note that this header includes Vulkan headers, so if you are writing a
    program or plugin that dynamically loads vulkan, you should first define
    `VK_NO_PROTOTYPES` before including it.
 */
 
-#ifndef PUGL_PUGL_VULKAN_HPP
-#define PUGL_PUGL_VULKAN_HPP
+#ifndef PUGL_VULKAN_HPP
+#define PUGL_VULKAN_HPP
 
 #include "pugl/pugl.h"
 #include "pugl/pugl.hpp"
-#include "pugl/pugl_vulkan.h"
+#include "pugl/vulkan.h"
 
 #include <vulkan/vulkan_core.h>
 
@@ -167,4 +167,4 @@ vulkanBackend() noexcept
 
 } // namespace pugl
 
-#endif // PUGL_PUGL_VULKAN_HPP
+#endif // PUGL_VULKAN_HPP