diff --git a/audio/drivers/ctr_csnd_audio.c b/audio/drivers/ctr_csnd_audio.c
index 0a5981be5b..624fc16843 100644
--- a/audio/drivers/ctr_csnd_audio.c
+++ b/audio/drivers/ctr_csnd_audio.c
@@ -14,10 +14,12 @@
  */
 
 #include <3ds.h>
+#include <string.h>
 
 #include "../audio_driver.h"
 #include "../../configuration.h"
 #include "../../performance.h"
+#include "../../system.h"
 
 typedef struct
 {
@@ -70,8 +72,8 @@ Result csndPlaySound_custom(int chn, u32 flags, float vol, float pan, void* data
 
 	if (encoding != CSND_ENCODING_PSG)
 	{
-		if (data0) paddr0 = osConvertVirtToPhys((u32)data0);
-		if (data1) paddr1 = osConvertVirtToPhys((u32)data1);
+		if (data0) paddr0 = osConvertVirtToPhys(data0);
+		if (data1) paddr1 = osConvertVirtToPhys(data1);
 
 		if (data0 && encoding == CSND_ENCODING_ADPCM)
 		{
@@ -117,8 +119,8 @@ static void *ctr_csnd_audio_init(const char *device, unsigned rate, unsigned lat
    memset(ctr->l, 0, CTR_CSND_AUDIO_SIZE);
    memset(ctr->r, 0, CTR_CSND_AUDIO_SIZE);
 
-   ctr->l_paddr              = osConvertVirtToPhys((u32)ctr->l);
-   ctr->r_paddr              = osConvertVirtToPhys((u32)ctr->r);
+   ctr->l_paddr              = osConvertVirtToPhys(ctr->l);
+   ctr->r_paddr              = osConvertVirtToPhys(ctr->r);
 
    ctr->pos                  = 0;
 
diff --git a/audio/drivers/ctr_dsp_audio.c b/audio/drivers/ctr_dsp_audio.c
index ab6d167ccb..762dd271f4 100644
--- a/audio/drivers/ctr_dsp_audio.c
+++ b/audio/drivers/ctr_dsp_audio.c
@@ -14,10 +14,12 @@
  */
 
 #include <3ds.h>
+#include <string.h>
 
 #include "../audio_driver.h"
 #include "../../configuration.h"
 #include "../../performance.h"
+#include "../../system.h"
 #include "../../ctr/ctr_debug.h"
 
 typedef struct
diff --git a/gfx/drivers/ctr_gfx.c b/gfx/drivers/ctr_gfx.c
index b8e73a6f03..4a0ff9c51d 100644
--- a/gfx/drivers/ctr_gfx.c
+++ b/gfx/drivers/ctr_gfx.c
@@ -542,7 +542,7 @@ static bool ctr_frame(void* data, const void* frame,
       {
          /* can copy the buffer directly with the GPU */
 //         GSPGPU_FlushDataCache(frame, pitch * height);
-         ctrGuSetCommandList_First(true,frame, pitch * height,0,0,0,0);
+         ctrGuSetCommandList_First(true,(void*)frame, pitch * height,0,0,0,0);
          ctrGuCopyImage(true, frame, pitch / (ctr->rgb32? 4: 2), height, ctr->rgb32 ? CTRGU_RGBA8: CTRGU_RGB565, false,
                         ctr->texture_swizzled, ctr->texture_width, ctr->rgb32 ? CTRGU_RGBA8: CTRGU_RGB565,  true);
       }
diff --git a/menu/menu_display.c b/menu/menu_display.c
index bffb253a22..a2dffb9e7a 100644
--- a/menu/menu_display.c
+++ b/menu/menu_display.c
@@ -18,6 +18,7 @@
 #include <queues/message_queue.h>
 #include <retro_miscellaneous.h>
 #include <gfx/math/matrix_4x4.h>
+#include <formats/image.h>
 
 #include "../config.def.h"
 #include "../gfx/video_thread_wrapper.h"