diff --git a/miniaudio.h b/miniaudio.h
index f7fa6c52..073a9516 100644
--- a/miniaudio.h
+++ b/miniaudio.h
@@ -6937,7 +6937,7 @@ BACKENDS
 
 ************************************************************************************************************************************************************/
 
-/* BEG WASAPI */
+/* BEG miniaudio_wasapi.h */
 /* WASAPI audio thread priority characteristics. */
 typedef enum
 {
@@ -6971,10 +6971,10 @@ MA_API ma_device_config_wasapi ma_device_config_wasapi_init(void);
 
 extern ma_device_backend_vtable* ma_device_backend_wasapi;
 MA_API ma_device_backend_vtable* ma_wasapi_get_vtable(void);
-/* END WASAPI */
+/* END miniaudio_wasapi.h */
 
 
-/* BEG DSOUND */
+/* BEG miniaudio_dsound.h */
 typedef struct ma_context_config_dsound
 {
     ma_handle hWnd; /* HWND. Optional window handle to pass into SetCooperativeLevel(). Will default to the foreground window, and if that fails, the desktop window. */
@@ -6993,10 +6993,10 @@ MA_API ma_device_config_dsound ma_device_config_dsound_init(void);
 
 extern ma_device_backend_vtable* ma_device_backend_dsound;
 MA_API ma_device_backend_vtable* ma_dsound_get_vtable(void);
-/* END DSOUND */
+/* END miniaudio_dsound.h */
 
 
-/* BEG WINMM */
+/* BEG miniaudio_winmm.h */
 typedef struct ma_context_config_winmm
 {
     int _unused;
@@ -7015,10 +7015,10 @@ MA_API ma_device_config_winmm ma_device_config_winmm_init(void);
 
 extern ma_device_backend_vtable* ma_device_backend_winmm;
 MA_API ma_device_backend_vtable* ma_winmm_get_vtable(void);
-/* END WINMM */
+/* END miniaudio_winmm.h */
 
 
-/* BEG COREAUDIO */
+/* BEG miniaudio_coreaudio.h */
 /* iOS/tvOS/watchOS session categories. */
 typedef enum
 {
@@ -7066,10 +7066,10 @@ MA_API ma_device_config_coreaudio ma_device_config_coreaudio_init(void);
 
 extern ma_device_backend_vtable* ma_device_backend_coreaudio;
 MA_API ma_device_backend_vtable* ma_coreaudio_get_vtable(void);
-/* END COREAUDIO */
+/* END miniaudio_coreaudio.h */
 
 
-/* BEG PIPEWIRE */
+/* BEG miniaudio_pipewire.h */
 typedef struct
 {
     int _unused;
@@ -7090,10 +7090,10 @@ MA_API ma_device_config_pipewire ma_device_config_pipewire_init(void);
 
 extern ma_device_backend_vtable* ma_device_backend_pipewire;
 MA_API ma_device_backend_vtable* ma_pipewire_get_vtable(void);
-/* END PIPEWIRE */
+/* END miniaudio_pipewire.h */
 
 
-/* BEG PULSEAUDIO */
+/* BEG miniaudio_pulseaudio.h */
 typedef struct ma_context_config_pulseaudio
 {
     const char* pApplicationName;
@@ -7116,10 +7116,10 @@ MA_API ma_device_config_pulseaudio ma_device_config_pulseaudio_init(void);
 
 extern ma_device_backend_vtable* ma_device_backend_pulseaudio;
 MA_API ma_device_backend_vtable* ma_pulseaudio_get_vtable(void);
-/* END PULSEAUDIO */
+/* END miniaudio_pulseaudio.h */
 
 
-/* BEG JACK */
+/* BEG miniaudio_jack.h */
 typedef struct ma_context_config_jack
 {
     const char* pClientName;
@@ -7139,10 +7139,10 @@ MA_API ma_device_config_jack ma_device_config_jack_init(void);
 
 extern ma_device_backend_vtable* ma_device_backend_jack;
 MA_API ma_device_backend_vtable* ma_jack_get_vtable(void);
-/* END JACK */
+/* END miniaudio_jack.h */
 
 
-/* BEG ALSA */
+/* BEG miniaudio_alsa.h */
 typedef struct ma_context_config_alsa
 {
     int _unused;
@@ -7165,10 +7165,10 @@ MA_API ma_device_config_alsa ma_device_config_alsa_init(void);
 
 extern ma_device_backend_vtable* ma_device_backend_alsa;
 MA_API ma_device_backend_vtable* ma_alsa_get_vtable(void);
-/* END ALSA */
+/* END miniaudio_alsa.h */
 
 
-/* BEG SNDIO */
+/* BEG miniaudio_sndio.h */
 typedef struct ma_context_config_sndio
 {
     int _unused;
@@ -7187,10 +7187,10 @@ MA_API ma_device_config_sndio ma_device_config_sndio_init(void);
 
 extern ma_device_backend_vtable* ma_device_backend_sndio;
 MA_API ma_device_backend_vtable* ma_sndio_get_vtable(void);
-/* END SNDIO */
+/* END miniaudio_sndio.h */
 
 
-/* BEG AUDIO4 */
+/* BEG miniaudio_audio4.h */
 typedef struct ma_context_config_audio4
 {
     int _unused;
@@ -7209,10 +7209,10 @@ MA_API ma_device_config_audio4 ma_device_config_audio4_init(void);
 
 extern ma_device_backend_vtable* ma_device_backend_audio4;
 MA_API ma_device_backend_vtable* ma_audio4_get_vtable(void);
-/* END AUDIO4 */
+/* END miniaudio_audio4.h */
 
 
-/* BEG OSS */
+/* BEG miniaudio_oss.h */
 typedef struct ma_context_config_oss
 {
     int _unused;
@@ -7231,10 +7231,10 @@ MA_API ma_device_config_oss ma_device_config_oss_init(void);
 
 extern ma_device_backend_vtable* ma_device_backend_oss;
 MA_API ma_device_backend_vtable* ma_oss_get_vtable(void);
-/* END OSS */
+/* END miniaudio_oss.h */
 
 
-/* BEG AAUDIO */
+/* BEG miniaudio_aaudio.h */
 /* AAudio usage types. */
 typedef enum
 {
@@ -7320,10 +7320,10 @@ MA_API ma_device_config_aaudio ma_device_config_aaudio_init(void);
 
 extern ma_device_backend_vtable* ma_device_backend_aaudio;
 MA_API ma_device_backend_vtable* ma_aaudio_get_vtable(void);
-/* END AAUDIO */
+/* END miniaudio_aaudio.h */
 
 
-/* BEG OPENSL */
+/* BEG miniaudio_opensl.h */
 /* OpenSL stream types. */
 typedef enum
 {
@@ -7367,10 +7367,10 @@ MA_API ma_device_config_opensl ma_device_config_opensl_init(void);
 
 extern ma_device_backend_vtable* ma_device_backend_opensl;
 MA_API ma_device_backend_vtable* ma_opensl_get_vtable(void);
-/* END OPENSL */
+/* END miniaudio_opensl.h */
 
 
-/* BEG WEBAUDIO */
+/* BEG miniaudio_webaudio.h */
 typedef enum ma_webaudio_latency_hint
 {
     ma_webaudio_latency_hint_interactive = 0,
@@ -7397,7 +7397,7 @@ MA_API ma_device_config_webaudio ma_device_config_webaudio_init(void);
 
 extern ma_device_backend_vtable* ma_device_backend_webaudio;
 MA_API ma_device_backend_vtable* ma_webaudio_get_vtable(void);
-/* END WEBAUDIO */
+/* END miniaudio_webaudio.h */
 
 
 /* BEG miniaudio_dreamcast.h */
@@ -7422,7 +7422,7 @@ MA_API ma_device_backend_vtable* ma_dreamcast_get_vtable(void);
 /* END miniaudio_dreamcast.h */
 
 
-/* BEG NULL */
+/* BEG miniaudio_null.h */
 typedef struct ma_context_config_null
 {
     int _unused;
@@ -7441,7 +7441,7 @@ MA_API ma_device_config_null ma_device_config_null_init(void);
 
 extern ma_device_backend_vtable* ma_device_backend_null;
 MA_API ma_device_backend_vtable* ma_null_get_vtable(void);
-/* END NULL */
+/* END miniaudio_null.h */
 
 
 /************************************************************************************************************************************************************
@@ -20004,8 +20004,6 @@ BACKENDS
     #define MA_HAS_NULL
 #endif
 
-
-
 /************************************************************************************************************************************************************
 
 END BACKENDS