diff --git a/examples/example_glfw_wgpu/main.cpp b/examples/example_glfw_wgpu/main.cpp
index 9ea267154..36ca9074b 100644
--- a/examples/example_glfw_wgpu/main.cpp
+++ b/examples/example_glfw_wgpu/main.cpp
@@ -22,13 +22,12 @@
 #if defined(IMGUI_IMPL_WEBGPU_BACKEND_WGPU)
 #include <emscripten/html5_webgpu.h>
 #endif
-#include <webgpu/webgpu.h>
-#include <webgpu/webgpu_cpp.h>
 #include "../libs/emscripten/emscripten_mainloop_stub.h"
-#else
-#if defined(IMGUI_IMPL_WEBGPU_BACKEND_DAWN)
-#include <webgpu/webgpu_glfw.h>
 #endif
+
+#include <webgpu/webgpu.h>
+#if defined(IMGUI_IMPL_WEBGPU_BACKEND_DAWN)
+#include <webgpu/webgpu_cpp.h>
 #endif
 
 // Data
@@ -323,6 +322,7 @@ int main(int, char**)
 #endif
 #include <GLFW/glfw3native.h>
 #undef Status                       // X11 headers are leaking this.
+#undef Success                      // X11 headers are leaking this.
 
 WGPUSurface CreateWGPUSurface(const WGPUInstance& instance, GLFWwindow* window)
 {
diff --git a/examples/example_sdl2_wgpu/main.cpp b/examples/example_sdl2_wgpu/main.cpp
index 1d95da572..3911cc58a 100644
--- a/examples/example_sdl2_wgpu/main.cpp
+++ b/examples/example_sdl2_wgpu/main.cpp
@@ -30,13 +30,13 @@
 #endif
 
 // Data
-WGPUInstance             wgpu_instance = nullptr;
-WGPUDevice               wgpu_device = nullptr;
-WGPUSurface              wgpu_surface = nullptr;
-WGPUQueue                wgpu_queue = nullptr;
-WGPUSurfaceConfiguration wgpu_surface_configuration = {};
-int                      wgpu_surface_width = 1280;
-int                      wgpu_surface_height = 800;
+static WGPUInstance             wgpu_instance = nullptr;
+static WGPUDevice               wgpu_device = nullptr;
+static WGPUSurface              wgpu_surface = nullptr;
+static WGPUQueue                wgpu_queue = nullptr;
+static WGPUSurfaceConfiguration wgpu_surface_configuration = {};
+static int                      wgpu_surface_width = 1280;
+static int                      wgpu_surface_height = 800;
 
 // Forward declarations
 static bool InitWGPU(SDL_Window* window);
@@ -282,6 +282,9 @@ int main(int, char**)
 #if !defined(__EMSCRIPTEN__) && (defined(IMGUI_IMPL_WEBGPU_BACKEND_WGPU) || defined(IMGUI_IMPL_WEBGPU_BACKEND_DAWN))
 
 #include <SDL_syswm.h>
+#undef Status   // X11 headers are leaking this.
+#undef Success  // X11 headers are leaking this.
+
 WGPUSurface CreateWGPUSurface(const WGPUInstance& instance, SDL_Window* window)
 {
     SDL_SysWMinfo sysWMInfo;
diff --git a/examples/example_sdl3_wgpu/main.cpp b/examples/example_sdl3_wgpu/main.cpp
index 377ffd9bb..63bfd8c66 100644
--- a/examples/example_sdl3_wgpu/main.cpp
+++ b/examples/example_sdl3_wgpu/main.cpp
@@ -32,18 +32,18 @@
 #endif
 
 // Data
-WGPUInstance             wgpu_instance = nullptr;
-WGPUDevice               wgpu_device = nullptr;
-WGPUSurface              wgpu_surface = nullptr;
-WGPUQueue                wgpu_queue = nullptr;
-WGPUSurfaceConfiguration wgpu_surface_configuration = {};
-int                      wgpu_surface_width = 1280;
-int                      wgpu_surface_height = 800;
+static WGPUInstance             wgpu_instance = nullptr;
+static WGPUDevice               wgpu_device = nullptr;
+static WGPUSurface              wgpu_surface = nullptr;
+static WGPUQueue                wgpu_queue = nullptr;
+static WGPUSurfaceConfiguration wgpu_surface_configuration = {};
+static int                      wgpu_surface_width = 1280;
+static int                      wgpu_surface_height = 800;
 
 // Forward declarations
 static bool InitWGPU(SDL_Window* window);
 
-void ResizeSurface(int width, int height)
+static void ResizeSurface(int width, int height)
 {
     wgpu_surface_configuration.width  = wgpu_surface_width  = width;
     wgpu_surface_configuration.height = wgpu_surface_height = height;