SDL_mixer: project: move SDL_mixer.h into SDL3_mixer subfolder

From ea2d3d2c8844c72a3a6ffcdfe2e4af76aac478c8 Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <[EMAIL REDACTED]>
Date: Tue, 1 Aug 2023 15:08:34 +0200
Subject: [PATCH] project: move SDL_mixer.h into SDL3_mixer subfolder

---
 .wikiheaders-options                                      | 6 +++---
 CMakeLists.txt                                            | 7 ++++---
 VisualC-WinRT/SDL_mixer-UWP.vcxproj                       | 2 +-
 VisualC-WinRT/SDL_mixer-UWP.vcxproj.filters               | 2 +-
 VisualC/SDL_mixer.vcxproj                                 | 2 +-
 VisualC/SDL_mixer.vcxproj.filters                         | 2 +-
 VisualC/pkg-support/cmake/sdl3_mixer-config-version.cmake | 6 +++---
 VisualC/pkg-support/cmake/sdl3_mixer-config.cmake         | 2 +-
 Xcode/SDL_mixer.xcodeproj/project.pbxproj                 | 2 +-
 build-scripts/android-prefab.sh                           | 6 +++---
 build-scripts/test-versioning.sh                          | 2 +-
 cmake/sdl3-mixer.pc.in                                    | 2 +-
 cmake/sdlmanpages.cmake                                   | 2 +-
 cmake/test/main.c                                         | 2 +-
 examples/playmus.c                                        | 2 +-
 examples/playwave.c                                       | 2 +-
 include/{SDL3 => SDL3_mixer}/SDL_mixer.h                  | 0
 release_checklist.md                                      | 2 +-
 src/codecs/load_aiff.c                                    | 2 +-
 src/codecs/load_sndfile.h                                 | 2 +-
 src/codecs/load_voc.c                                     | 2 +-
 src/codecs/native_midi/native_midi_common.c               | 2 +-
 src/codecs/native_midi/native_midi_macosx.c               | 2 +-
 src/effect_position.c                                     | 2 +-
 src/effect_stereoreverse.c                                | 2 +-
 src/effects_internal.c                                    | 2 +-
 src/effects_internal.h                                    | 2 +-
 src/mixer.c                                               | 2 +-
 src/music.c                                               | 2 +-
 src/music.h                                               | 2 +-
 30 files changed, 38 insertions(+), 37 deletions(-)
 rename include/{SDL3 => SDL3_mixer}/SDL_mixer.h (100%)

diff --git a/.wikiheaders-options b/.wikiheaders-options
index 35cdcf1d..5fc65800 100644
--- a/.wikiheaders-options
+++ b/.wikiheaders-options
@@ -1,10 +1,10 @@
 projectfullname = SDL_mixer
 projectshortname = SDL_mixer
-incsubdir = include/SDL3
+incsubdir = include/SDL3_mixer
 wikisubdir = SDL3_mixer
 apiprefixregex = (Mix_|MIX_)
-mainincludefname = SDL3/SDL_mixer.h
-versionfname = include/SDL3/SDL_mixer.h
+mainincludefname = SDL3_mixer/SDL_mixer.h
+versionfname = include/SDL3_mixer/SDL_mixer.h
 versionmajorregex = \A\#define\s+SDL_MIXER_MAJOR_VERSION\s+(\d+)\Z
 versionminorregex = \A\#define\s+SDL_MIXER_MINOR_VERSION\s+(\d+)\Z
 versionpatchregex = \A\#define\s+SDL_MIXER_PATCHLEVEL\s+(\d+)\Z
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 643b9f48..e9693790 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -250,7 +250,7 @@ target_include_directories(${sdl3_mixer_target_name}
         "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
         "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/SDL3>"
         "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
-        "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/SDL3>"
+        "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/SDL3_mixer>"
     PRIVATE
         src
         src/codecs
@@ -911,8 +911,8 @@ if(SDL3MIXER_INSTALL)
         RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT library
     )
     install(FILES
-        "${CMAKE_CURRENT_SOURCE_DIR}/include/SDL3/SDL_mixer.h"
-        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/SDL3" COMPONENT devel
+        "${CMAKE_CURRENT_SOURCE_DIR}/include/SDL3_mixer/SDL_mixer.h"
+        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/SDL3_mixer" COMPONENT devel
     )
 
     if(INSTALL_EXTRA_TARGETS)
@@ -993,6 +993,7 @@ if(SDL3MIXER_INSTALL)
 
     if(SDL3MIXER_INSTALL_MAN)
         SDL_generate_manpages(
+            HEADERS_DIR "${PROJECT_SOURCE_DIR}/include/SDL3_mixer"
             SYMBOL "Mix_Init"
             WIKIHEADERS_PL_PATH "${CMAKE_CURRENT_SOURCE_DIR}/build-scripts/wikiheaders.pl"
         )
diff --git a/VisualC-WinRT/SDL_mixer-UWP.vcxproj b/VisualC-WinRT/SDL_mixer-UWP.vcxproj
index 3e15bfa6..1be6429a 100644
--- a/VisualC-WinRT/SDL_mixer-UWP.vcxproj
+++ b/VisualC-WinRT/SDL_mixer-UWP.vcxproj
@@ -64,7 +64,7 @@
     <ClCompile Include="..\src\codecs\timidity\timidity.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\include\SDL_mixer.h" />
+    <ClInclude Include="..\include\SDL3_mixer\SDL_mixer.h" />
     <ClInclude Include="..\src\codecs\load_aiff.h" />
     <ClInclude Include="..\src\codecs\load_sndfile.h" />
     <ClInclude Include="..\src\codecs\load_voc.h" />
diff --git a/VisualC-WinRT/SDL_mixer-UWP.vcxproj.filters b/VisualC-WinRT/SDL_mixer-UWP.vcxproj.filters
index c439d894..aedb7e0e 100644
--- a/VisualC-WinRT/SDL_mixer-UWP.vcxproj.filters
+++ b/VisualC-WinRT/SDL_mixer-UWP.vcxproj.filters
@@ -141,7 +141,7 @@
     <ClInclude Include="..\src\utils.h">
       <Filter>Sources</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_mixer.h">
+    <ClInclude Include="..\include\SDL3_mixer\SDL_mixer.h">
       <Filter>Public Headers</Filter>
     </ClInclude>
     <ClInclude Include="..\src\codecs\load_aiff.h">
diff --git a/VisualC/SDL_mixer.vcxproj b/VisualC/SDL_mixer.vcxproj
index 7230b6cc..23c430a9 100644
--- a/VisualC/SDL_mixer.vcxproj
+++ b/VisualC/SDL_mixer.vcxproj
@@ -215,7 +215,7 @@
     <Bscmake />
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\include\SDL_mixer.h" />
+    <ClInclude Include="..\include\SDL3_mixer\SDL_mixer.h" />
     <ClInclude Include="..\src\effects_internal.h" />
     <ClInclude Include="..\src\mixer.h" />
     <ClInclude Include="..\src\music.h" />
diff --git a/VisualC/SDL_mixer.vcxproj.filters b/VisualC/SDL_mixer.vcxproj.filters
index 03f3e501..5e57219a 100644
--- a/VisualC/SDL_mixer.vcxproj.filters
+++ b/VisualC/SDL_mixer.vcxproj.filters
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClInclude Include="..\include\SDL_mixer.h">
+    <ClInclude Include="..\include\SDL3_mixer\SDL_mixer.h">
       <Filter>Public Headers</Filter>
     </ClInclude>
     <ClInclude Include="..\src\utils.h">
diff --git a/VisualC/pkg-support/cmake/sdl3_mixer-config-version.cmake b/VisualC/pkg-support/cmake/sdl3_mixer-config-version.cmake
index ad998996..16e61347 100644
--- a/VisualC/pkg-support/cmake/sdl3_mixer-config-version.cmake
+++ b/VisualC/pkg-support/cmake/sdl3_mixer-config-version.cmake
@@ -3,12 +3,12 @@
 # SDL3_mixer CMake version configuration file:
 # This file is meant to be placed in a cmake subfolder of SDL3_mixer-devel-3.x.y-VC
 
-if(NOT EXISTS "${CMAKE_CURRENT_LIST_DIR}/../include/SDL3/SDL_mixer.h")
-    message(AUTHOR_WARNING "Could not find SDL3/SDL_mixer.h. This script is meant to be placed in a CMake subfolder of SDL3_mixer-devel-3.x.y-VC")
+if(NOT EXISTS "${CMAKE_CURRENT_LIST_DIR}/../include/SDL3_mixer/SDL_mixer.h")
+    message(AUTHOR_WARNING "Could not find SDL3_mixer/SDL_mixer.h. This script is meant to be placed in a CMake subfolder of SDL3_mixer-devel-3.x.y-VC")
     return()
 endif()
 
-file(READ "${CMAKE_CURRENT_LIST_DIR}/../include/SDL3/SDL_mixer.h" _sdl_mixer_h)
+file(READ "${CMAKE_CURRENT_LIST_DIR}/../include/SDL3_mixer/SDL_mixer.h" _sdl_mixer_h)
 string(REGEX MATCH "#define[ \t]+SDL_MIXER_MAJOR_VERSION[ \t]+([0-9]+)" _sdl_major_re "${_sdl_mixer_h}")
 set(_sdl_major "${CMAKE_MATCH_1}")
 string(REGEX MATCH "#define[ \t]+SDL_MIXER_MINOR_VERSION[ \t]+([0-9]+)" _sdl_minor_re "${_sdl_mixer_h}")
diff --git a/VisualC/pkg-support/cmake/sdl3_mixer-config.cmake b/VisualC/pkg-support/cmake/sdl3_mixer-config.cmake
index 2821863c..d9839edf 100644
--- a/VisualC/pkg-support/cmake/sdl3_mixer-config.cmake
+++ b/VisualC/pkg-support/cmake/sdl3_mixer-config.cmake
@@ -64,7 +64,7 @@ if(NOT TARGET SDL3_mixer::SDL3_mixer)
     add_library(SDL3_mixer::SDL3_mixer SHARED IMPORTED)
     set_target_properties(SDL3_mixer::SDL3_mixer
         PROPERTIES
-            INTERFACE_INCLUDE_DIRECTORIES "${_sdl3mixer_incdir};${_sdl3mixer_incdir}/SDL3"
+            INTERFACE_INCLUDE_DIRECTORIES "${_sdl3mixer_incdir};${_sdl3mixer_incdir}/SDL3_mixer"
             IMPORTED_IMPLIB "${_sdl3mixer_library}"
             IMPORTED_LOCATION "${_sdl3mixer_dll}"
             COMPATIBLE_INTERFACE_BOOL "SDL3_SHARED"
diff --git a/Xcode/SDL_mixer.xcodeproj/project.pbxproj b/Xcode/SDL_mixer.xcodeproj/project.pbxproj
index ee17dd44..cd77e522 100644
--- a/Xcode/SDL_mixer.xcodeproj/project.pbxproj
+++ b/Xcode/SDL_mixer.xcodeproj/project.pbxproj
@@ -156,7 +156,7 @@
 
 /* Begin PBXFileReference section */
 		0448E8AD108B937A00C9D3EA /* native_midi_macosx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = native_midi_macosx.c; sourceTree = "<group>"; };
-		1014BAEA010A4B677F000001 /* SDL_mixer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_mixer.h; path = SDL3/SDL_mixer.h; sourceTree = "<group>"; };
+		1014BAEA010A4B677F000001 /* SDL_mixer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_mixer.h; path = SDL3_mixer/SDL_mixer.h; sourceTree = "<group>"; };
 		630FBD8220D52105009867AB /* music_opus.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = music_opus.c; sourceTree = "<group>"; };
 		630FBD8420D5211F009867AB /* music_opus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = music_opus.h; sourceTree = "<group>"; };
 		639008C62385A822009019FA /* utils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = utils.c; sourceTree = "<group>"; };
diff --git a/build-scripts/android-prefab.sh b/build-scripts/android-prefab.sh
index 24082843..df280686 100755
--- a/build-scripts/android-prefab.sh
+++ b/build-scripts/android-prefab.sh
@@ -42,9 +42,9 @@ android_api=19
 android_ndk=21
 android_stl="c++_shared"
 
-sdlmixer_major=$(sed -ne 's/^#define SDL_MIXER_MAJOR_VERSION  *//p' "${sdlmixer_root}/include/SDL3/SDL_mixer.h")
-sdlmixer_minor=$(sed -ne 's/^#define SDL_MIXER_MINOR_VERSION  *//p' "${sdlmixer_root}/include/SDL3/SDL_mixer.h")
-sdlmixer_patch=$(sed -ne 's/^#define SDL_MIXER_PATCHLEVEL  *//p' "${sdlmixer_root}/include/SDL3/SDL_mixer.h")
+sdlmixer_major=$(sed -ne 's/^#define SDL_MIXER_MAJOR_VERSION  *//p' "${sdlmixer_root}/include/SDL3_mixer/SDL_mixer.h")
+sdlmixer_minor=$(sed -ne 's/^#define SDL_MIXER_MINOR_VERSION  *//p' "${sdlmixer_root}/include/SDL3_mixer/SDL_mixer.h")
+sdlmixer_patch=$(sed -ne 's/^#define SDL_MIXER_PATCHLEVEL  *//p' "${sdlmixer_root}/include/SDL3_mixer/SDL_mixer.h")
 sdlmixer_version="${sdlmixer_major}.${sdlmixer_minor}.${sdlmixer_patch}"
 echo "Building Android prefab package for SDL_mixer version $sdlmixer_version"
 
diff --git a/build-scripts/test-versioning.sh b/build-scripts/test-versioning.sh
index 6468b1db..6d4a0e63 100755
--- a/build-scripts/test-versioning.sh
+++ b/build-scripts/test-versioning.sh
@@ -9,7 +9,7 @@ cd `dirname $0`/..
 # Needed so sed doesn't report illegal byte sequences on macOS
 export LC_CTYPE=C
 
-header=include/SDL3/SDL_mixer.h
+header=include/SDL3_mixer/SDL_mixer.h
 ref_major=$(sed -ne 's/^#define SDL_MIXER_MAJOR_VERSION  *//p' $header)
 ref_minor=$(sed -ne 's/^#define SDL_MIXER_MINOR_VERSION  *//p' $header)
 ref_micro=$(sed -ne 's/^#define SDL_MIXER_PATCHLEVEL  *//p' $header)
diff --git a/cmake/sdl3-mixer.pc.in b/cmake/sdl3-mixer.pc.in
index 7ed18e87..1ef53e47 100644
--- a/cmake/sdl3-mixer.pc.in
+++ b/cmake/sdl3-mixer.pc.in
@@ -10,4 +10,4 @@ Requires: sdl3 >= @SDL_REQUIRED_VERSION@
 Libs: -L${libdir} -lSDL3_mixer
 Requires.private: @PC_REQUIRES@
 Libs.private: @PC_LIBS@
-Cflags: -I${includedir} -I${includedir}/SDL3
+Cflags: -I${includedir} -I${includedir}/SDL3_mixer
diff --git a/cmake/sdlmanpages.cmake b/cmake/sdlmanpages.cmake
index 0049de1f..f7691285 100644
--- a/cmake/sdlmanpages.cmake
+++ b/cmake/sdlmanpages.cmake
@@ -17,7 +17,7 @@ function(SDL_generate_manpages)
   endif()
 
   if(NOT ARG_HEADERS_DIR)
-    set(ARG_HEADERS_DIR "${PROJECT_SOURCE_DIR}/include/SDL3")
+    message(FATAL_ERROR "Missing required HEADERS_DIR argument")
   endif()
 
   # FIXME: get rid of SYMBOL and let the perl script figure out the dependencies
diff --git a/cmake/test/main.c b/cmake/test/main.c
index c513dcaf..78c52e80 100644
--- a/cmake/test/main.c
+++ b/cmake/test/main.c
@@ -1,6 +1,6 @@
 #include <SDL3/SDL.h>
 #include <SDL3/SDL_main.h>
-#include <SDL3/SDL_mixer.h>
+#include <SDL3_mixer/SDL_mixer.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/examples/playmus.c b/examples/playmus.c
index cd8fbbc5..28a4b456 100644
--- a/examples/playmus.c
+++ b/examples/playmus.c
@@ -32,7 +32,7 @@
 
 #include <SDL3/SDL.h>
 #include <SDL3/SDL_main.h>
-#include <SDL3/SDL_mixer.h>
+#include <SDL3_mixer/SDL_mixer.h>
 
 #ifdef HAVE_SIGNAL_H
 #include <signal.h>
diff --git a/examples/playwave.c b/examples/playwave.c
index 4bfffcfa..6d0ec7a3 100644
--- a/examples/playwave.c
+++ b/examples/playwave.c
@@ -29,7 +29,7 @@
 
 #include <SDL3/SDL.h>
 #include <SDL3/SDL_main.h>
-#include <SDL3/SDL_mixer.h>
+#include <SDL3_mixer/SDL_mixer.h>
 
 #ifdef HAVE_SIGNAL_H
 #include <signal.h>
diff --git a/include/SDL3/SDL_mixer.h b/include/SDL3_mixer/SDL_mixer.h
similarity index 100%
rename from include/SDL3/SDL_mixer.h
rename to include/SDL3_mixer/SDL_mixer.h
diff --git a/release_checklist.md b/release_checklist.md
index a30ce2e8..b4a0dd96 100644
--- a/release_checklist.md
+++ b/release_checklist.md
@@ -6,7 +6,7 @@
 
 * Bump version number to 3.EVEN.0 in all these locations:
 
-    * `include/SDL3/SDL_mixer.h`:
+    * `include/SDL3_mixer/SDL_mixer.h`:
         `SDL_MIXER_MAJOR_VERSION`, `SDL_MIXER_MINOR_VERSION`, `SDL_MIXER_PATCHLEVEL`
     * `CMakeLists.txt`:
         `MAJOR_VERSION`, `MINOR_VERSION`, `MICRO_VERSION`
diff --git a/src/codecs/load_aiff.c b/src/codecs/load_aiff.c
index 48a533d0..d636f8cf 100644
--- a/src/codecs/load_aiff.c
+++ b/src/codecs/load_aiff.c
@@ -29,7 +29,7 @@
 */
 
 #include <SDL3/SDL_endian.h>
-#include <SDL3/SDL_mixer.h>
+#include <SDL3_mixer/SDL_mixer.h>
 #include "load_aiff.h"
 
 /*********************************************/
diff --git a/src/codecs/load_sndfile.h b/src/codecs/load_sndfile.h
index 2d88935e..a5c049cf 100644
--- a/src/codecs/load_sndfile.h
+++ b/src/codecs/load_sndfile.h
@@ -28,7 +28,7 @@
 #ifndef LOAD_SNDFILE_H
 #define LOAD_SNDFILE_H
 
-#include <SDL3/SDL_mixer.h>
+#include <SDL3_mixer/SDL_mixer.h>
 
 /* Don't call this directly; use Mix_LoadWAV_RW() for now. */
 SDL_AudioSpec *Mix_LoadSndFile_RW (SDL_RWops *src, SDL_bool freesrc,
diff --git a/src/codecs/load_voc.c b/src/codecs/load_voc.c
index 927b9270..5730f5ba 100644
--- a/src/codecs/load_voc.c
+++ b/src/codecs/load_voc.c
@@ -29,7 +29,7 @@
         (http://www.freshmeat.net/projects/sox/)
 */
 
-#include <SDL3/SDL_mixer.h>
+#include <SDL3_mixer/SDL_mixer.h>
 #include "load_voc.h"
 
 /* Private data for VOC file */
diff --git a/src/codecs/native_midi/native_midi_common.c b/src/codecs/native_midi/native_midi_common.c
index 8ed75915..91dc1dde 100644
--- a/src/codecs/native_midi/native_midi_common.c
+++ b/src/codecs/native_midi/native_midi_common.c
@@ -22,7 +22,7 @@
 
 #include "native_midi_common.h"
 
-#include <SDL3/SDL_mixer.h>
+#include <SDL3_mixer/SDL_mixer.h>
 
 /* The constant 'MThd' */
 #define MIDI_MAGIC	0x4d546864
diff --git a/src/codecs/native_midi/native_midi_macosx.c b/src/codecs/native_midi/native_midi_macosx.c
index cd826151..5f18ded1 100644
--- a/src/codecs/native_midi/native_midi_macosx.c
+++ b/src/codecs/native_midi/native_midi_macosx.c
@@ -32,7 +32,7 @@
 #include <AvailabilityMacros.h>
 
 #include <SDL3/SDL_endian.h>
-#include <SDL3/SDL_mixer.h>
+#include <SDL3_mixer/SDL_mixer.h>
 #include "../../mixer.h"
 #include "native_midi.h"
 
diff --git a/src/effect_position.c b/src/effect_position.c
index f99cae6b..e5663675 100644
--- a/src/effect_position.c
+++ b/src/effect_position.c
@@ -25,7 +25,7 @@
 */
 
 #include <SDL3/SDL_endian.h>
-#include <SDL3/SDL_mixer.h>
+#include <SDL3_mixer/SDL_mixer.h>
 
 #include "mixer.h"
 
diff --git a/src/effect_stereoreverse.c b/src/effect_stereoreverse.c
index 22064df0..af878b1b 100644
--- a/src/effect_stereoreverse.c
+++ b/src/effect_stereoreverse.c
@@ -24,7 +24,7 @@
   effect callback API. They are meant for speed over quality.  :)
 */
 
-#include <SDL3/SDL_mixer.h>
+#include <SDL3_mixer/SDL_mixer.h>
 
 #define MIX_INTERNAL_EFFECT__
 #include "effects_internal.h"
diff --git a/src/effects_internal.c b/src/effects_internal.c
index 4936cc05..0d30f669 100644
--- a/src/effects_internal.c
+++ b/src/effects_internal.c
@@ -26,7 +26,7 @@
 
 /* ------ These are used internally only. Don't touch. ------ */
 
-#include <SDL3/SDL_mixer.h>
+#include <SDL3_mixer/SDL_mixer.h>
 
 #define MIX_INTERNAL_EFFECT__
 #include "effects_internal.h"
diff --git a/src/effects_internal.h b/src/effects_internal.h
index 714959fb..833b6ce1 100644
--- a/src/effects_internal.h
+++ b/src/effects_internal.h
@@ -26,7 +26,7 @@
 #error You should not include this file or use these functions.
 #endif
 
-#include <SDL3/SDL_mixer.h>
+#include <SDL3_mixer/SDL_mixer.h>
 
 extern int _Mix_effects_max_speed;
 extern void *_Eff_volume_table;
diff --git a/src/mixer.c b/src/mixer.c
index e3e48e49..03e83307 100644
--- a/src/mixer.c
+++ b/src/mixer.c
@@ -21,7 +21,7 @@
 
 #include <SDL3/SDL.h>
 
-#include <SDL3/SDL_mixer.h>
+#include <SDL3_mixer/SDL_mixer.h>
 #include "mixer.h"
 #include "music.h"
 #include "load_aiff.h"
diff --git a/src/music.c b/src/music.c
index 908d14f4..c295b793 100644
--- a/src/music.c
+++ b/src/music.c
@@ -22,7 +22,7 @@
 #include <SDL3/SDL_log.h>
 #include <SDL3/SDL_timer.h>
 
-#include <SDL3/SDL_mixer.h>
+#include <SDL3_mixer/SDL_mixer.h>
 #include "mixer.h"
 #include "music.h"
 
diff --git a/src/music.h b/src/music.h
index 172c0f54..c20c6c04 100644
--- a/src/music.h
+++ b/src/music.h
@@ -21,7 +21,7 @@
 #ifndef MUSIC_H_
 #define MUSIC_H_
 
-#include <SDL3/SDL_mixer.h>
+#include <SDL3_mixer/SDL_mixer.h>
 
 /* Supported music APIs, in order of preference */