diff --git a/src/code_80057C60.c b/src/code_80057C60.c
index 044e15619..2be481432 100644
--- a/src/code_80057C60.c
+++ b/src/code_80057C60.c
@@ -687,6 +687,7 @@ void render_object_for_player(s32 cameraId) {
     CM_DrawObjects(cameraId);
     CM_DrawParticles(cameraId);
     CM_RenderCourseObjects(cameraId);
+    CM_DrawEditor();
 
     // switch (gCurrentCourseId) {
     //     case COURSE_MARIO_RACEWAY:
diff --git a/src/engine/editor/Editor.cpp b/src/engine/editor/Editor.cpp
index 2feb0ccf6..87c3adab8 100644
--- a/src/engine/editor/Editor.cpp
+++ b/src/engine/editor/Editor.cpp
@@ -19,8 +19,6 @@ extern "C" {
 #include "main.h"
 #include "defines.h"
 #include "actors.h"
-#include "math_util.h"
-#include "math_util_2.h"
 #include "camera.h"
 }
 
diff --git a/src/engine/editor/Editor.h b/src/engine/editor/Editor.h
index 04963180d..e6dc89f97 100644
--- a/src/engine/editor/Editor.h
+++ b/src/engine/editor/Editor.h
@@ -2,7 +2,6 @@
 
 #include <libultraship.h>
 #include <libultra/gbi.h>
-#include "engine/objects/Flagpole.h"
 #include "ObjectPicker.h"
 
 class ObjectPicker;
diff --git a/src/engine/editor/Gizmo.h b/src/engine/editor/Gizmo.h
index 0b7e545ca..52cfaba42 100644
--- a/src/engine/editor/Gizmo.h
+++ b/src/engine/editor/Gizmo.h
@@ -3,7 +3,6 @@
 #include <libultraship.h>
 #include <libultra/gbi.h>
 #include "Collision.h"
-#include "engine/objects/Flagpole.h"
 
 class Gizmo {
 public:
diff --git a/src/engine/editor/ObjectPicker.cpp b/src/engine/editor/ObjectPicker.cpp
index af8207ab3..ecdbefd85 100644
--- a/src/engine/editor/ObjectPicker.cpp
+++ b/src/engine/editor/ObjectPicker.cpp
@@ -20,8 +20,6 @@ extern "C" {
 #include "main.h"
 #include "defines.h"
 #include "actors.h"
-#include "math_util.h"
-#include "math_util_2.h"
 #include "camera.h"
 }
 
diff --git a/src/engine/editor/ObjectPicker.h b/src/engine/editor/ObjectPicker.h
index e81f6480e..08c529dea 100644
--- a/src/engine/editor/ObjectPicker.h
+++ b/src/engine/editor/ObjectPicker.h
@@ -3,7 +3,6 @@
 #include <libultraship.h>
 #include <libultra/gbi.h>
 #include "Collision.h"
-#include "engine/objects/Flagpole.h"
 #include "Gizmo.h"
 
 class ObjectPicker {
diff --git a/src/main.c b/src/main.c
index e524ab26d..f86e05ed3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -836,6 +836,7 @@ void race_logic_loop(void) {
         }
     }
     func_8005A070();
+    CM_TickEditor();
     profiler_log_thread5_time(LEVEL_SCRIPT_EXECUTE);
     sNumVBlanks = 0;
     gNumScreens = 0;
diff --git a/src/port/Game.cpp b/src/port/Game.cpp
index bef582e61..15daf1c40 100644
--- a/src/port/Game.cpp
+++ b/src/port/Game.cpp
@@ -393,7 +393,6 @@ void CM_TickObjects() {
     if (gWorldInstance.CurrentCourse) {
         gWorldInstance.TickObjects();
     }
-gEditor.Tick();
 }
 
 // A couple objects such as lakitu are ticked inside of process_game_tick which support 60fps.
@@ -408,6 +407,13 @@ void CM_DrawObjects(s32 cameraId) {
     if (gWorldInstance.CurrentCourse) {
         gWorldInstance.DrawObjects(cameraId);
     }
+}
+
+void CM_TickEditor() {
+    gEditor.Tick();
+}
+
+void CM_DrawEditor() {
     gEditor.Draw();
 }
 
diff --git a/src/port/Game.h b/src/port/Game.h
index cb65db105..df2c8c6ce 100644
--- a/src/port/Game.h
+++ b/src/port/Game.h
@@ -70,6 +70,9 @@ void CM_TickObjects();
 void CM_TickObjects60fps();
 void CM_DrawObjects(s32 cameraId);
 
+void CM_TickEditor();
+void CM_TickDraw();
+
 void CM_TickParticles(void);
 void CM_DrawParticles(s32 cameraId);