5 files changed, 8 insertions, 6 deletions
diff --git a/bindings/cxx/include/pugl/cairo.hpp b/bindings/cxx/include/pugl/cairo.hpp
index 4df2702..d321b0b 100644
--- a/bindings/cxx/include/pugl/cairo.hpp
+++ b/bindings/cxx/include/pugl/cairo.hpp
@@ -35,7 +35,7 @@ namespace pugl {
 */
 
 /// @copydoc puglCairoBackend
-static inline const PuglBackend*
+inline const PuglBackend*
 cairoBackend() noexcept
 {
 	return puglCairoBackend();
diff --git a/bindings/cxx/include/pugl/gl.hpp b/bindings/cxx/include/pugl/gl.hpp
index 2777cbf..ba7143b 100644
--- a/bindings/cxx/include/pugl/gl.hpp
+++ b/bindings/cxx/include/pugl/gl.hpp
@@ -38,14 +38,14 @@ namespace pugl {
 using GlFunc = PuglGlFunc;
 
 /// @copydoc puglGetProcAddress
-static inline GlFunc
+inline GlFunc
 getProcAddress(const char* name) noexcept
 {
 	return puglGetProcAddress(name);
 }
 
 /// @copydoc puglGlBackend
-static inline const PuglBackend*
+inline const PuglBackend*
 glBackend() noexcept
 {
 	return puglGlBackend();
diff --git a/bindings/cxx/include/pugl/pugl.hpp b/bindings/cxx/include/pugl/pugl.hpp
index 4f5f3cf..31903a9 100644
--- a/bindings/cxx/include/pugl/pugl.hpp
+++ b/bindings/cxx/include/pugl/pugl.hpp
@@ -210,7 +210,7 @@ enum class Status {
 static_assert(Status(PUGL_UNSUPPORTED_TYPE) == Status::unsupportedType, "");
 
 /// @copydoc puglStrerror
-static inline const char*
+inline const char*
 strerror(const Status status) noexcept
 {
 	return puglStrerror(static_cast<PuglStatus>(status));
@@ -278,6 +278,8 @@ public:
 	World(World&&) = delete;
 	World& operator=(World&&) = delete;
 
+	~World() = default;
+
 	explicit World(WorldType type, WorldFlags flags)
 	    : Wrapper{puglNewWorld(static_cast<PuglWorldType>(type), flags)}
 	{
diff --git a/bindings/cxx/include/pugl/stub.hpp b/bindings/cxx/include/pugl/stub.hpp
index 74e8ef2..02a8dc2 100644
--- a/bindings/cxx/include/pugl/stub.hpp
+++ b/bindings/cxx/include/pugl/stub.hpp
@@ -35,7 +35,7 @@ namespace pugl {
 */
 
 /// @copydoc puglStubBackend
-static inline const PuglBackend*
+inline const PuglBackend*
 stubBackend() noexcept
 {
 	return puglStubBackend();
diff --git a/bindings/cxx/include/pugl/vulkan.hpp b/bindings/cxx/include/pugl/vulkan.hpp
index a7b16cb..5ce8acd 100644
--- a/bindings/cxx/include/pugl/vulkan.hpp
+++ b/bindings/cxx/include/pugl/vulkan.hpp
@@ -155,7 +155,7 @@ createSurface(const VulkanLoader&                loader,
 }
 
 /// @copydoc puglVulkanBackend
-static inline const PuglBackend*
+inline const PuglBackend*
 vulkanBackend() noexcept
 {
 	return puglVulkanBackend();