diff --git a/src/ending/podium_ceremony_actors.c b/src/ending/podium_ceremony_actors.c
index 288d21897..1e3911287 100644
--- a/src/ending/podium_ceremony_actors.c
+++ b/src/ending/podium_ceremony_actors.c
@@ -19,6 +19,7 @@
 #include "math_util.h"
 #include <string.h>
 
+#include "src/port/Game.h"
 #include "engine/Matrix.h"
 
 s32 fireworkConeColour[] = {
diff --git a/src/engine/AllActors.h b/src/engine/AllActors.h
index e9b74cad5..f6e753761 100644
--- a/src/engine/AllActors.h
+++ b/src/engine/AllActors.h
@@ -31,7 +31,7 @@
 #include "objects/Seagull.h"
 #include "objects/Thwomp.h"
 #include "objects/Seagull.h"
-#include "objects/Trashbin.h"
+#include "objects/TrashBin.h"
 #include "objects/Trophy.h"
 #include "objects/Snowman.h"
 #include "objects/Podium.h"
diff --git a/src/engine/editor/SceneManager.cpp b/src/engine/editor/SceneManager.cpp
index 81e0a3c60..8a125d1a1 100644
--- a/src/engine/editor/SceneManager.cpp
+++ b/src/engine/editor/SceneManager.cpp
@@ -8,7 +8,7 @@
 #include <fstream>
 #include <nlohmann/json.hpp>
 #include "port/Engine.h"
-#include <libultraship/src/resource/type/json.h>
+#include <libultraship/src/resource/type/Json.h>
 #include <libultraship/src/resource/File.h>
 
 namespace Editor {
diff --git a/src/port/Game.h b/src/port/Game.h
index 472b4f6bf..0cfdb9a9f 100644
--- a/src/port/Game.h
+++ b/src/port/Game.h
@@ -75,6 +75,8 @@ void CM_TickObjects60fps();
 void CM_DrawObjects(s32 cameraId);
 
 void CM_TickEditor();
+void CM_DrawEditor();
+void CM_Editor_SetLevelDimensions(s16 minX, s16 maxX, s16 minZ, s16 maxZ, s16 minY, s16 maxY);
 void CM_TickDraw();
 void Editor_ClearMatrix();
 
diff --git a/src/racing/framebuffer_effects.c b/src/racing/framebuffer_effects.c
index b613043de..eeeefe73b 100644
--- a/src/racing/framebuffer_effects.c
+++ b/src/racing/framebuffer_effects.c
@@ -20,15 +20,15 @@ s32 buf = -1;
 
 void FB_CreateFramebuffers(void) {
     if (gReusableFrameBuffer == -1) {
-        gReusableFrameBuffer = gfx_create_framebuffer(SCREEN_WIDTH, SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT, true, true, true);
+        gReusableFrameBuffer = gfx_create_framebuffer(SCREEN_WIDTH, SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT, true);
     }
 
     if (gN64ResFrameBuffer == -1) {
-        gN64ResFrameBuffer = gfx_create_framebuffer(SCREEN_WIDTH, SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT, false, true, true);
+        gN64ResFrameBuffer = gfx_create_framebuffer(SCREEN_WIDTH, SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT, false);
     }
 
     if (buf == -1) {
-        gN64ResFrameBuffer = gfx_create_framebuffer(SCREEN_WIDTH, SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT, false, true, true);
+        gN64ResFrameBuffer = gfx_create_framebuffer(SCREEN_WIDTH, SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT, false);
     }
 }