39 files changed, 78 insertions, 78 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
diff --git a/examples/cube_view.h b/examples/cube_view.h
index ceece42..87bf3b5 100644
--- a/examples/cube_view.h
+++ b/examples/cube_view.h
@@ -21,7 +21,7 @@
 
 #include "demo_utils.h"
 
-#include "pugl/pugl_gl.h"
+#include "pugl/gl.h"
 
 // clang-format off
 
diff --git a/examples/pugl_cairo_demo.c b/examples/pugl_cairo_demo.c
index 5fe0661..d8a1b08 100644
--- a/examples/pugl_cairo_demo.c
+++ b/examples/pugl_cairo_demo.c
@@ -22,8 +22,8 @@
 #include "demo_utils.h"
 #include "test/test_utils.h"
 
+#include "pugl/cairo.h"
 #include "pugl/pugl.h"
-#include "pugl/pugl_cairo.h"
 
 #include <cairo.h>
 
diff --git a/examples/pugl_cursor_demo.c b/examples/pugl_cursor_demo.c
index ad9bb8e..de6b6f2 100644
--- a/examples/pugl_cursor_demo.c
+++ b/examples/pugl_cursor_demo.c
@@ -21,8 +21,8 @@
 
 #include "test/test_utils.h"
 
+#include "pugl/gl.h"
 #include "pugl/pugl.h"
-#include "pugl/pugl_gl.h"
 
 #include <stdbool.h>
 
diff --git a/examples/pugl_cxx_demo.cpp b/examples/pugl_cxx_demo.cpp
index 214c03d..ed2d21a 100644
--- a/examples/pugl_cxx_demo.cpp
+++ b/examples/pugl_cxx_demo.cpp
@@ -23,10 +23,10 @@
 #include "demo_utils.h"
 #include "test/test_utils.h"
 
+#include "pugl/gl.hpp"
 #include "pugl/pugl.h"
 #include "pugl/pugl.hpp"
 #include "pugl/pugl.ipp" // IWYU pragma: keep
-#include "pugl/pugl_gl.hpp"
 
 #include <cmath>
 
diff --git a/examples/pugl_embed_demo.c b/examples/pugl_embed_demo.c
index b481d4a..db4a141 100644
--- a/examples/pugl_embed_demo.c
+++ b/examples/pugl_embed_demo.c
@@ -23,8 +23,8 @@
 #include "demo_utils.h"
 #include "test/test_utils.h"
 
+#include "pugl/gl.h"
 #include "pugl/pugl.h"
-#include "pugl/pugl_gl.h"
 
 #include <math.h>
 #include <stdbool.h>
diff --git a/examples/pugl_print_events.c b/examples/pugl_print_events.c
index 95ac440..816086d 100644
--- a/examples/pugl_print_events.c
+++ b/examples/pugl_print_events.c
@@ -22,7 +22,7 @@
 #include "test/test_utils.h"
 
 #include "pugl/pugl.h"
-#include "pugl/pugl_stub.h"
+#include "pugl/stub.h"
 
 #include <stdbool.h>
 #include <stdio.h>
diff --git a/examples/pugl_shader_demo.c b/examples/pugl_shader_demo.c
index 4b8064d..476489d 100644
--- a/examples/pugl_shader_demo.c
+++ b/examples/pugl_shader_demo.c
@@ -42,8 +42,8 @@
 
 #include "glad/glad.h"
 
+#include "pugl/gl.h"
 #include "pugl/pugl.h"
-#include "pugl/pugl_gl.h"
 
 #include <math.h>
 #include <stddef.h>
diff --git a/examples/pugl_vulkan_cxx_demo.cpp b/examples/pugl_vulkan_cxx_demo.cpp
index fa40734..12b2626 100644
--- a/examples/pugl_vulkan_cxx_demo.cpp
+++ b/examples/pugl_vulkan_cxx_demo.cpp
@@ -37,7 +37,7 @@
 #include "pugl/pugl.h"
 #include "pugl/pugl.hpp"
 #include "pugl/pugl.ipp" // IWYU pragma: keep
-#include "pugl/pugl_vulkan.hpp"
+#include "pugl/vulkan.hpp"
 
 #include <vulkan/vk_platform.h>
 #include <vulkan/vulkan_core.h>
diff --git a/examples/pugl_vulkan_demo.c b/examples/pugl_vulkan_demo.c
index ef4550a..a65731b 100644
--- a/examples/pugl_vulkan_demo.c
+++ b/examples/pugl_vulkan_demo.c
@@ -24,7 +24,7 @@
 #include "test/test_utils.h"
 
 #include "pugl/pugl.h"
-#include "pugl/pugl_vulkan.h"
+#include "pugl/vulkan.h"
 
 #include <vulkan/vk_platform.h>
 #include <vulkan/vulkan_core.h>
diff --git a/examples/pugl_window_demo.c b/examples/pugl_window_demo.c
index f326f21..9b7795c 100644
--- a/examples/pugl_window_demo.c
+++ b/examples/pugl_window_demo.c
@@ -23,8 +23,8 @@
 #include "demo_utils.h"
 #include "test/test_utils.h"
 
+#include "pugl/gl.h"
 #include "pugl/pugl.h"
-#include "pugl/pugl_gl.h"
 
 #include <math.h>
 #include <stdbool.h>
diff --git a/include/pugl/pugl_cairo.h b/include/pugl/cairo.h
index 6e5a035..2022c21 100644
--- a/include/pugl/pugl_cairo.h
+++ b/include/pugl/cairo.h
@@ -15,12 +15,12 @@
 */
 
 /**
-   @file pugl_cairo.h
+   @file cairo.h
    @brief Declaration of Cairo backend accessor.
 */
 
-#ifndef PUGL_PUGL_CAIRO_H
-#define PUGL_PUGL_CAIRO_H
+#ifndef PUGL_CAIRO_H
+#define PUGL_CAIRO_H
 
 #include "pugl/pugl.h"
 
@@ -47,4 +47,4 @@ puglCairoBackend(void);
 
 PUGL_END_DECLS
 
-#endif // PUGL_PUGL_CAIRO_H
+#endif // PUGL_CAIRO_H
diff --git a/include/pugl/pugl_gl.h b/include/pugl/gl.h
index 78b994b..dca9a45 100644
--- a/include/pugl/pugl_gl.h
+++ b/include/pugl/gl.h
@@ -15,12 +15,12 @@
 */
 
 /**
-   @file pugl_gl.h
+   @file gl.h
    @brief OpenGL-specific API.
 */
 
-#ifndef PUGL_PUGL_GL_H
-#define PUGL_PUGL_GL_H
+#ifndef PUGL_GL_H
+#define PUGL_GL_H
 
 #include "pugl/pugl.h"
 
@@ -87,4 +87,4 @@ PUGL_END_DECLS
    @}
 */
 
-#endif // PUGL_PUGL_GL_H
+#endif // PUGL_GL_H
diff --git a/include/pugl/pugl.h b/include/pugl/pugl.h
index 19f9fa4..814b39b 100644
--- a/include/pugl/pugl.h
+++ b/include/pugl/pugl.h
@@ -899,8 +899,8 @@ puglGetHandle(PuglView* view);
 
    Pugl includes the following backends:
 
-   - puglGlBackend(), declared in pugl_gl.h
-   - puglCairoBackend(), declared in pugl_cairo.h
+   - puglGlBackend(), declared in pugl/gl.h
+   - puglCairoBackend(), declared in pugl/cairo.h
 
    Note that backends are modular and not compiled into the main Pugl library
    to avoid unnecessary dependencies.  To use a particular backend,
diff --git a/include/pugl/pugl_stub.h b/include/pugl/stub.h
index 569415c..fd62ff0 100644
--- a/include/pugl/pugl_stub.h
+++ b/include/pugl/stub.h
@@ -15,12 +15,12 @@
 */
 
 /**
-   @file pugl_stub.h
+   @file stub.h
    @brief Stub backend functions and accessor declaration.
 */
 
-#ifndef PUGL_PUGL_STUB_H
-#define PUGL_PUGL_STUB_H
+#ifndef PUGL_STUB_H
+#define PUGL_STUB_H
 
 #include "pugl/pugl.h"
 
@@ -49,4 +49,4 @@ puglStubBackend(void);
 
 PUGL_END_DECLS
 
-#endif // PUGL_PUGL_STUB_H
+#endif // PUGL_STUB_H
diff --git a/include/pugl/pugl_vulkan.h b/include/pugl/vulkan.h
index 451c28f..a2755f9 100644
--- a/include/pugl/pugl_vulkan.h
+++ b/include/pugl/vulkan.h
@@ -15,15 +15,15 @@
 */
 
 /**
-   @file pugl_vulkan.h Vulkan-specific API.
+   @file vulkan.h Vulkan-specific 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_H
-#define PUGL_PUGL_VULKAN_H
+#ifndef PUGL_VULKAN_H
+#define PUGL_VULKAN_H
 
 #include "pugl/pugl.h"
 
@@ -145,4 +145,4 @@ puglVulkanBackend(void);
 
 PUGL_END_DECLS
 
-#endif // PUGL_PUGL_VULKAN_H
+#endif // PUGL_VULKAN_H
diff --git a/src/mac_gl.m b/src/mac_gl.m
index 038b942..f8847c0 100644
--- a/src/mac_gl.m
+++ b/src/mac_gl.m
@@ -23,7 +23,7 @@
 #include "mac.h"
 #include "stub.h"
 
-#include "pugl/pugl_gl.h"
+#include "pugl/gl.h"
 
 #ifndef __MAC_10_10
 #    define NSOpenGLProfileVersion4_1Core NSOpenGLProfileVersion3_2Core
diff --git a/src/mac_stub.m b/src/mac_stub.m
index b4d9058..576734f 100644
--- a/src/mac_stub.m
+++ b/src/mac_stub.m
@@ -23,7 +23,7 @@
 #include "mac.h"
 #include "stub.h"
 
-#include "pugl/pugl_stub.h"
+#include "pugl/stub.h"
 
 #import <Cocoa/Cocoa.h>
 
diff --git a/src/mac_vulkan.m b/src/mac_vulkan.m
index 90d349b..39c7f29 100644
--- a/src/mac_vulkan.m
+++ b/src/mac_vulkan.m
@@ -26,8 +26,8 @@
 #include "types.h"
 
 #include "pugl/pugl.h"
-#include "pugl/pugl_stub.h"
-#include "pugl/pugl_vulkan.h"
+#include "pugl/stub.h"
+#include "pugl/vulkan.h"
 
 #include <vulkan/vulkan_core.h>
 #include <vulkan/vulkan_macos.h>
diff --git a/src/win.c b/src/win.c
index 0578749..d7c0d57 100644
--- a/src/win.c
+++ b/src/win.c
@@ -25,7 +25,7 @@
 #include "stub.h"
 
 #include "pugl/pugl.h"
-#include "pugl/pugl_stub.h"
+#include "pugl/stub.h"
 
 #include <windows.h>
 #include <windowsx.h>
diff --git a/src/win_gl.c b/src/win_gl.c
index f011f5b..e46ece8 100644
--- a/src/win_gl.c
+++ b/src/win_gl.c
@@ -23,7 +23,7 @@
 #include "types.h"
 #include "win.h"
 
-#include "pugl/pugl_gl.h"
+#include "pugl/gl.h"
 
 #include <windows.h>
 
diff --git a/src/win_stub.c b/src/win_stub.c
index e066e4d..2027836 100644
--- a/src/win_stub.c
+++ b/src/win_stub.c
@@ -18,7 +18,7 @@
 #include "types.h"
 #include "win.h"
 
-#include "pugl/pugl_stub.h"
+#include "pugl/stub.h"
 
 PuglStatus
 puglWinStubConfigure(PuglView* view)
diff --git a/src/win_vulkan.c b/src/win_vulkan.c
index 5e3622e..eb20698 100644
--- a/src/win_vulkan.c
+++ b/src/win_vulkan.c
@@ -24,8 +24,8 @@
 #include "types.h"
 #include "win.h"
 
-#include "pugl/pugl_stub.h"
-#include "pugl/pugl_vulkan.h"
+#include "pugl/stub.h"
+#include "pugl/vulkan.h"
 
 #include <vulkan/vulkan.h>
 #include <vulkan/vulkan_win32.h>
diff --git a/src/x11_cairo.c b/src/x11_cairo.c
index f0b38a9..abfabff 100644
--- a/src/x11_cairo.c
+++ b/src/x11_cairo.c
@@ -22,8 +22,8 @@
 #include "types.h"
 #include "x11.h"
 
+#include "pugl/cairo.h"
 #include "pugl/pugl.h"
-#include "pugl/pugl_cairo.h"
 
 #include <X11/Xutil.h>
 #include <cairo-xlib.h>
diff --git a/src/x11_gl.c b/src/x11_gl.c
index 72c2421..bab85c6 100644
--- a/src/x11_gl.c
+++ b/src/x11_gl.c
@@ -23,8 +23,8 @@
 #include "types.h"
 #include "x11.h"
 
+#include "pugl/gl.h"
 #include "pugl/pugl.h"
-#include "pugl/pugl_gl.h"
 
 #include <GL/glx.h>
 #include <X11/X.h>
diff --git a/src/x11_stub.c b/src/x11_stub.c
index 0f2e6d2..be66a88 100644
--- a/src/x11_stub.c
+++ b/src/x11_stub.c
@@ -14,7 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include "pugl/pugl_stub.h"
+#include "pugl/stub.h"
 
 #include "stub.h"
 #include "types.h"
diff --git a/src/x11_vulkan.c b/src/x11_vulkan.c
index 1ca2ace..7004fd8 100644
--- a/src/x11_vulkan.c
+++ b/src/x11_vulkan.c
@@ -25,7 +25,7 @@
 #include "x11.h"
 
 #include "pugl/pugl.h"
-#include "pugl/pugl_vulkan.h"
+#include "pugl/vulkan.h"
 
 #include <vulkan/vulkan_core.h>
 #include <vulkan/vulkan_xlib.h>
diff --git a/test/test_build.c b/test/test_build.c
index 984d23a..5259c7c 100644
--- a/test/test_build.c
+++ b/test/test_build.c
@@ -20,10 +20,10 @@
 
 #define PUGL_DISABLE_DEPRECATED
 
-#include "pugl/pugl.h"       // IWYU pragma: keep
-#include "pugl/pugl_cairo.h" // IWYU pragma: keep
-#include "pugl/pugl_gl.h"    // IWYU pragma: keep
-#include "pugl/pugl_stub.h"  // IWYU pragma: keep
+#include "pugl/cairo.h" // IWYU pragma: keep
+#include "pugl/gl.h"    // IWYU pragma: keep
+#include "pugl/pugl.h"  // IWYU pragma: keep
+#include "pugl/stub.h"  // IWYU pragma: keep
 
 int
 main(void)
diff --git a/test/test_build.cpp b/test/test_build.cpp
index e8e64ab..4e29901 100644
--- a/test/test_build.cpp
+++ b/test/test_build.cpp
@@ -20,12 +20,12 @@
 
 #define PUGL_DISABLE_DEPRECATED
 
-#include "pugl/pugl.h"         // IWYU pragma: keep
-#include "pugl/pugl.hpp"       // IWYU pragma: keep
-#include "pugl/pugl.ipp"       // IWYU pragma: keep
-#include "pugl/pugl_cairo.hpp" // IWYU pragma: keep
-#include "pugl/pugl_gl.hpp"    // IWYU pragma: keep
-#include "pugl/pugl_stub.hpp"  // IWYU pragma: keep
+#include "pugl/cairo.hpp" // IWYU pragma: keep
+#include "pugl/gl.hpp"    // IWYU pragma: keep
+#include "pugl/pugl.h"    // IWYU pragma: keep
+#include "pugl/pugl.hpp"  // IWYU pragma: keep
+#include "pugl/pugl.ipp"  // IWYU pragma: keep
+#include "pugl/stub.hpp"  // IWYU pragma: keep
 
 int
 main()
diff --git a/test/test_gl_hints.c b/test/test_gl_hints.c
index a40fdfa..c30d0ed 100644
--- a/test/test_gl_hints.c
+++ b/test/test_gl_hints.c
@@ -22,8 +22,8 @@
 
 #include "test_utils.h"
 
+#include "pugl/gl.h"
 #include "pugl/pugl.h"
-#include "pugl/pugl_gl.h"
 
 #include <assert.h>
 
diff --git a/test/test_realize.c b/test/test_realize.c
index 4a12d1d..bb0b327 100644
--- a/test/test_realize.c
+++ b/test/test_realize.c
@@ -27,7 +27,7 @@
 #include "test_utils.h"
 
 #include "pugl/pugl.h"
-#include "pugl/pugl_stub.h"
+#include "pugl/stub.h"
 
 #include <assert.h>
 #include <stdbool.h>
diff --git a/test/test_redisplay.c b/test/test_redisplay.c
index 91b606f..66b9168 100644
--- a/test/test_redisplay.c
+++ b/test/test_redisplay.c
@@ -24,7 +24,7 @@
 #include "test_utils.h"
 
 #include "pugl/pugl.h"
-#include "pugl/pugl_stub.h"
+#include "pugl/stub.h"
 
 #include <assert.h>
 #include <stdbool.h>
diff --git a/test/test_show_hide.c b/test/test_show_hide.c
index ebbbee9..6252c28 100644
--- a/test/test_show_hide.c
+++ b/test/test_show_hide.c
@@ -24,7 +24,7 @@
 #include "test_utils.h"
 
 #include "pugl/pugl.h"
-#include "pugl/pugl_stub.h"
+#include "pugl/stub.h"
 
 #include <assert.h>
 #include <stdbool.h>
diff --git a/test/test_stub_hints.c b/test/test_stub_hints.c
index 96b2914..2bfc86c 100644
--- a/test/test_stub_hints.c
+++ b/test/test_stub_hints.c
@@ -23,7 +23,7 @@
 #include "test_utils.h"
 
 #include "pugl/pugl.h"
-#include "pugl/pugl_stub.h"
+#include "pugl/stub.h"
 
 #include <assert.h>
 
diff --git a/test/test_timer.c b/test/test_timer.c
index d567da0..219fa59 100644
--- a/test/test_timer.c
+++ b/test/test_timer.c
@@ -24,7 +24,7 @@
 #include "test_utils.h"
 
 #include "pugl/pugl.h"
-#include "pugl/pugl_stub.h"
+#include "pugl/stub.h"
 
 #include <assert.h>
 #include <math.h>
diff --git a/test/test_update.c b/test/test_update.c
index bdcb28b..02b72a3 100644
--- a/test/test_update.c
+++ b/test/test_update.c
@@ -24,7 +24,7 @@
 #include "test_utils.h"
 
 #include "pugl/pugl.h"
-#include "pugl/pugl_stub.h"
+#include "pugl/stub.h"
 
 #include <assert.h>
 #include <stdbool.h>