diff --git a/src/audio/external.h b/src/audio/external.h
index 6425b936a..122ef8950 100644
--- a/src/audio/external.h
+++ b/src/audio/external.h
@@ -1,7 +1,7 @@
 #ifndef AUDIO_EXTERNAL_H
 #define AUDIO_EXTERNAL_H
 
-#include "common_structs.h"
+#include <common_structs.h>
 #include "camera.h"
 
 #define ADSR_STATE_DISABLED 0
diff --git a/src/audio/playback.c b/src/audio/playback.c
index e85d1e42b..1d8af00a6 100644
--- a/src/audio/playback.c
+++ b/src/audio/playback.c
@@ -693,7 +693,7 @@ struct Note *alloc_note_from_active(struct NotePool *pool, struct SequenceChanne
         func_800BD8F4(aNote, seqLayer);
         audio_list_push_back(&pool->releasing, &aNote->listItem);
     }
-    
+
     return aNote;
 }
 
diff --git a/src/audio/port_eu.c b/src/audio/port_eu.c
index 11b000175..6d29a041c 100644
--- a/src/audio/port_eu.c
+++ b/src/audio/port_eu.c
@@ -62,7 +62,7 @@ struct SPTask *create_next_audio_frame_task(void) {
     if ((gAudioFrameCount % gAudioBufferParameters.presetUnk4) != 0) {
         return NULL;
     }
-    osSendMesg(D_800EA3A8, (OSMesg) gAudioFrameCount, 0);
+    osSendMesg(D_800EA3A8, (OSMesg) gAudioFrameCount, OS_MESG_NOBLOCK);
 
     gAudioTaskIndex ^= 1;
     gCurrAiBufferIndex++;
diff --git a/src/audio/synthesis.h b/src/audio/synthesis.h
index a1854442b..175615f37 100644
--- a/src/audio/synthesis.h
+++ b/src/audio/synthesis.h
@@ -2,7 +2,7 @@
 #define AUDIO_SYNTHESIS_H
 
 #include "audio/internal.h"
-#include "PR/abi.h"
+#include <PR/abi.h>
 
 #define DEFAULT_LEN_1CH 0x180
 #define DEFAULT_LEN_2CH 0x300