1 files changed, 3 insertions, 6 deletions
diff --git a/src/code/sys_cfb.c b/src/code/sys_cfb.c
index 32600643a..b559a44ee 100644
--- a/src/code/sys_cfb.c
+++ b/src/code/sys_cfb.c
@@ -1,5 +1,5 @@
-#include "prevent_bss_reordering.h"
 #include "z64.h"
+#include "buffers.h"
 #include "regs.h"
 #include "functions.h"
 #include "macros.h"
@@ -41,9 +41,6 @@ u8 gSysCfbHiResEnabled;
 #include "system_malloc.h"
 #include "z64vimode.h"
 
-extern u16 gFramebufferHiRes0[HIRES_BUFFER_WIDTH][HIRES_BUFFER_HEIGHT];
-extern u16 gFramebufferHiRes1[HIRES_BUFFER_WIDTH][HIRES_BUFFER_HEIGHT];
-
 void SysCfb_SetLoResMode(void) {
     gFramebuffers[1] = sCfbLoRes1;
     gFramebuffers[0] = sCfbLoRes0;
@@ -93,8 +90,8 @@ void SysCfb_SetHiResMode(void) {
 }
 
 void SysCfb_Init(void) {
-    sCfbLoRes1 = gFramebuffer1;
-    sCfbLoRes0 = gFramebuffer0;
+    sCfbLoRes1 = gLoBuffer.framebuffer;
+    sCfbLoRes0 = gHiBuffer.framebuffer;
     sCfbHiRes1 = gFramebufferHiRes1;
     sCfbHiRes0 = gFramebufferHiRes0;
     SysCfb_SetLoResMode();