diff --git a/src/platform/3ds/main.c b/src/platform/3ds/main.c
index bf3929690..f720fe8cd 100644
--- a/src/platform/3ds/main.c
+++ b/src/platform/3ds/main.c
@@ -94,7 +94,7 @@ int main() {
 	GBAVideoSoftwareRendererCreate(&renderer);
 	renderer.outputBuffer = anonymousMemoryMap(256 * VIDEO_VERTICAL_PIXELS * 2);
 	renderer.outputBufferStride = 256;
-	GBAVideoAssociateRenderer(&context.gba->video, &renderer.d);
+	context.renderer = &renderer.d;
 
 	if (!font) {
 		goto cleanup;
diff --git a/src/platform/libretro/libretro.c b/src/platform/libretro/libretro.c
index 853126c2a..03863f775 100644
--- a/src/platform/libretro/libretro.c
+++ b/src/platform/libretro/libretro.c
@@ -182,7 +182,7 @@ void retro_init(void) {
 	GBAVideoSoftwareRendererCreate(&renderer);
 	renderer.outputBuffer = malloc(256 * VIDEO_VERTICAL_PIXELS * BYTES_PER_PIXEL);
 	renderer.outputBufferStride = 256;
-	GBAVideoAssociateRenderer(&context.gba->video, &renderer.d);
+	context->renderer = &renderer.d;
 
 	GBAAudioResizeBuffer(&context.gba->audio, SAMPLES);
 
diff --git a/src/platform/psp2/psp2-context.c b/src/platform/psp2/psp2-context.c
index 4e9a328fc..67be76f2f 100644
--- a/src/platform/psp2/psp2-context.c
+++ b/src/platform/psp2/psp2-context.c
@@ -103,7 +103,7 @@ void GBAPSP2Setup() {
 	GBAVideoSoftwareRendererCreate(&renderer);
 	renderer.outputBuffer = vita2d_texture_get_datap(tex);
 	renderer.outputBufferStride = 256;
-	GBAVideoAssociateRenderer(&context.gba->video, &renderer.d);
+	context.renderer = &renderer.d;
 	printf("%s starting", projectName);
 }
 
diff --git a/src/platform/test/fuzz-main.c b/src/platform/test/fuzz-main.c
index 1111c2945..0e7a3eb70 100644
--- a/src/platform/test/fuzz-main.c
+++ b/src/platform/test/fuzz-main.c
@@ -84,7 +84,7 @@ int main(int argc, char** argv) {
 		GBAVideoSoftwareRendererCreate(&renderer);
 		renderer.outputBuffer = malloc(256 * 256 * 4);
 		renderer.outputBufferStride = 256;
-		GBAVideoAssociateRenderer(&context.gba->video, &renderer.d);
+		context->renderer = &renderer.d;
 	}
 
 	GBAContextStart(&context);
diff --git a/src/platform/wii/main.c b/src/platform/wii/main.c
index 286aedc9e..77821a07f 100644
--- a/src/platform/wii/main.c
+++ b/src/platform/wii/main.c
@@ -156,7 +156,7 @@ int main() {
 	GBAVideoSoftwareRendererCreate(&renderer);
 	renderer.outputBuffer = memalign(32, 256 * 256 * BYTES_PER_PIXEL);
 	renderer.outputBufferStride = 256;
-	GBAVideoAssociateRenderer(&context.gba->video, &renderer.d);
+	context.renderer = renderer.d;
 
 	GBAAudioResizeBuffer(&context.gba->audio, SAMPLES);