$ git diff
diff --git a/include/vlc_aout.h b/include/vlc_aout.h
index 43fbf2f120..cae702e95f 100644
--- a/include/vlc_aout.h
+++ b/include/vlc_aout.h
@@ -281,7 +281,7 @@ typedef enum
     AOUT_CHANIDX_MAX
 } vlc_chan_order_idx_t;

-static_assert(AOUT_CHANIDX_MAX == AOUT_CHAN_MAX, "channel count mismatch");
+//static_assert(AOUT_CHANIDX_MAX == AOUT_CHAN_MAX, "channel count mismatch");

 #define AOUT_CHAN_REMAP_INIT { \
     AOUT_CHANIDX_LEFT,  \
diff --git a/modules/demux/mp4/essetup.c b/modules/demux/mp4/essetup.c
index 4ec1bbc85b..e4efecdbb0 100644
--- a/modules/demux/mp4/essetup.c
+++ b/modules/demux/mp4/essetup.c
@@ -624,7 +624,7 @@ int SetupVideoES( demux_t *p_demux, mp4_track_t *p_track, MP4_Box_t *p_sample )

         case ATOM_av01:
         {
-            static_assert(ATOM_av01 == VLC_CODEC_AV1, "VLC_CODEC_AV1 != ATOM_av01");
+            //static_assert(ATOM_av01 == VLC_CODEC_AV1, "VLC_CODEC_AV1 != ATOM_av01");
             MP4_Box_t *p_av1C = MP4_BoxGet( p_sample, "av1C" );
             if( p_av1C && BOXDATA(p_av1C) )
             {
diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 6fa1502051..d23aa3ce46 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -28,6 +28,7 @@
  *****************************************************************************/
 #include "mp4.h"

+#include <vlc_fixups.h>
 #include <vlc_demux.h>
 #include <vlc_charset.h>                           /* EnsureUTF8 */
 #include <vlc_input.h>
(END)