--- ./dr_mp3.h.origin	2025-05-29 01:37:01.463577333 -0500
+++ ./dr_mp3.h	2025-05-29 01:39:37.833199230 -0500
@@ -279,7 +279,7 @@
 */
 typedef struct
 {
-    int frame_bytes, channels, hz, layer, bitrate_kbps;
+    int frame_bytes, channels, sample_rate, layer, bitrate_kbps;
 } drmp3dec_frame_info;
 
 typedef struct
@@ -2296,7 +2296,7 @@
     DRMP3_COPY_MEMORY(dec->header, hdr, DRMP3_HDR_SIZE);
     info->frame_bytes = i + frame_size;
     info->channels = DRMP3_HDR_IS_MONO(hdr) ? 1 : 2;
-    info->hz = drmp3_hdr_sample_rate_hz(hdr);
+    info->sample_rate = drmp3_hdr_sample_rate_hz(hdr);
     info->layer = 4 - DRMP3_HDR_GET_LAYER(hdr);
     info->bitrate_kbps = drmp3_hdr_bitrate_kbps(hdr);
 
@@ -2720,7 +2720,7 @@
             pMP3->pcmFramesConsumedInMP3Frame = 0;
             pMP3->pcmFramesRemainingInMP3Frame = pcmFramesRead;
             pMP3->mp3FrameChannels = info.channels;
-            pMP3->mp3FrameSampleRate = info.hz;
+            pMP3->mp3FrameSampleRate = info.sample_rate;
             break;
         } else if (info.frame_bytes == 0) {
             /* Need more data. minimp3 recommends doing data submission in 16K chunks. */
@@ -2779,7 +2779,7 @@
             pMP3->pcmFramesConsumedInMP3Frame  = 0;
             pMP3->pcmFramesRemainingInMP3Frame = pcmFramesRead;
             pMP3->mp3FrameChannels             = info.channels;
-            pMP3->mp3FrameSampleRate           = info.hz;
+            pMP3->mp3FrameSampleRate           = info.sample_rate;
             break;
         } else if (info.frame_bytes > 0) {
             /* No frames were read, but it looks like we skipped past one. Read the next MP3 frame. */
@@ -3069,7 +3069,8 @@
     #ifdef ENOSYS
         case ENOSYS: return DRMP3_NOT_IMPLEMENTED;
     #endif
-    #ifdef ENOTEMPTY
+    /*In AIX, ENOTEMPTY and EEXIST uses the same value*/
+    #if defined(ENOTEMPTY) && ENOTEMPTY != EEXIST
         case ENOTEMPTY: return DRMP3_DIRECTORY_NOT_EMPTY;
     #endif
     #ifdef ELOOP
--- ./dr_wav.h.origin	2025-05-29 01:39:43.555457533 -0500
+++ ./dr_wav.h	2025-05-29 01:40:32.220796811 -0500
@@ -4704,7 +4704,8 @@
     #ifdef ENOSYS
         case ENOSYS: return DRWAV_NOT_IMPLEMENTED;
     #endif
-    #ifdef ENOTEMPTY
+    /*In AIX, ENOTEMPTY and EEXIST uses the same value*/
+    #if defined(ENOTEMPTY) && ENOTEMPTY != EEXIST
         case ENOTEMPTY: return DRWAV_DIRECTORY_NOT_EMPTY;
     #endif
     #ifdef ELOOP
--- ./dr_flac.h.origin  2025-05-29 02:04:11.368304813 -0500
+++ ./dr_flac.h 2025-05-29 02:05:28.663470721 -0500
@@ -8294,7 +8294,8 @@
     #ifdef ENOSYS
         case ENOSYS: return DRFLAC_NOT_IMPLEMENTED;
     #endif
-    #ifdef ENOTEMPTY
+    /*In AIX, ENOTEMPTY and EEXIST uses the same value*/
+    #if defined(ENOTEMPTY) && ENOTEMPTY != EEXIST
         case ENOTEMPTY: return DRFLAC_DIRECTORY_NOT_EMPTY;
     #endif
     #ifdef ELOOP