diff --git a/external/parallel-rdp/ParallelRDPWrapper.hpp b/external/parallel-rdp/ParallelRDPWrapper.hpp
index adbb97bb..6370a0da 100644
--- a/external/parallel-rdp/ParallelRDPWrapper.hpp
+++ b/external/parallel-rdp/ParallelRDPWrapper.hpp
@@ -1,7 +1,6 @@
 #pragma once
-#include <Core.hpp>
+#include <backend/Core.hpp>
 #include <wsi.hpp>
-#include <core/mmio/VI.hpp>
 
 struct Window;
 static SDL_Window* g_Window;
diff --git a/src/backend/Core.hpp b/src/backend/Core.hpp
index 29710c4e..79f424bb 100644
--- a/src/backend/Core.hpp
+++ b/src/backend/Core.hpp
@@ -1,9 +1,7 @@
 #pragma once
 #include <SDL2/SDL_events.h>
 #include <backend/core/Interpreter.hpp>
-#include <backend/core/Mem.hpp>
 #include <string>
-#include <backend/core/registers/Registers.hpp>
 #include <SDL2/SDL_timer.h>
 
 struct Window;
diff --git a/src/backend/MemoryRegions.hpp b/src/backend/MemoryRegions.hpp
index 64ac2028..dc3284a5 100644
--- a/src/backend/MemoryRegions.hpp
+++ b/src/backend/MemoryRegions.hpp
@@ -52,7 +52,6 @@
 #define PI_REGION 0x04600000 ... 0x046FFFFF
 #define RI_REGION 0x04700000 ... 0x047FFFFF
 #define SI_REGION 0x04800000 ... 0x048FFFFF
-#define SRAM_REGION 0x08000000 ... 0x0FFFFFFF
 #define CART_REGION_1_1 (CART_REGION_START_1_1) ... (CART_REGION_END_1_1)
 #define CART_REGION_1_2 (CART_REGION_START_1_2) ... (CART_REGION_END_1_2)
 #define CART_REGION_2_1 (CART_REGION_START_2_1) ... (CART_REGION_END_2_1)
diff --git a/src/backend/MupenMovie.hpp b/src/backend/MupenMovie.hpp
index 5cf8f79e..ca73c3f2 100644
--- a/src/backend/MupenMovie.hpp
+++ b/src/backend/MupenMovie.hpp
@@ -2,6 +2,5 @@
 #include <backend/core/mmio/PIF.hpp>
 
 void LoadTAS(const char* filename);
-void UnloadTAS();
 n64::Controller TasNextInputs();
 bool TasMovieLoaded();
\ No newline at end of file
diff --git a/src/backend/Scheduler.cpp b/src/backend/Scheduler.cpp
index 4bb88d36..8a2fc05d 100644
--- a/src/backend/Scheduler.cpp
+++ b/src/backend/Scheduler.cpp
@@ -1,5 +1,4 @@
 #include <Scheduler.hpp>
-#include <Mem.hpp>
 #include <core/registers/Registers.hpp>
 
 Scheduler scheduler;
diff --git a/src/backend/Scheduler.hpp b/src/backend/Scheduler.hpp
index 43bf45bb..78afc056 100644
--- a/src/backend/Scheduler.hpp
+++ b/src/backend/Scheduler.hpp
@@ -1,8 +1,7 @@
 #pragma once
-#include <common.hpp>
 #include <queue>
 #include <array>
-#include "log.hpp"
+#include <log.hpp>
 
 namespace n64 {
 struct Mem;
diff --git a/src/backend/core/mmio/PIF.cpp b/src/backend/core/mmio/PIF.cpp
index 558c3a18..27e97797 100644
--- a/src/backend/core/mmio/PIF.cpp
+++ b/src/backend/core/mmio/PIF.cpp
@@ -154,9 +154,7 @@ void PIF::ProcessCommands(Mem &mem) {
       u8* cmd = &ram[i++];
       u8 cmdlen = cmd[CMD_LEN] & 0x3F;
 
-      if (cmdlen == 0) {
-        channel++;
-      } else if (cmdlen == 0x3D) {
+      if (cmdlen == 0 || cmdlen == 0x3D) {
         channel++;
       } else if (cmdlen == 0x3E) {
         break;
@@ -171,11 +169,7 @@ void PIF::ProcessCommands(Mem &mem) {
         u8* res = &ram[i + cmdlen];
 
         switch (cmd[CMD_IDX]) {
-          case 0xff:
-            ControllerID(res);
-            channel++;
-            break;
-          case 0:
+          case 0: case 0xff:
             ControllerID(res);
             channel++;
             break;
@@ -249,7 +243,7 @@ void PIF::ProcessCommands(Mem &mem) {
   }
 }
 
-void PIF::MempakRead(u8* cmd, u8* res) const {
+void PIF::MempakRead(const u8* cmd, u8* res) const {
   u16 offset = cmd[3] << 8;
   offset |= cmd[4];
 
@@ -305,7 +299,7 @@ void PIF::MempakWrite(u8* cmd, u8* res) const {
   res[0] = data_crc(&cmd[5]);
 }
 
-void PIF::EepromRead(u8* cmd, u8* res, const Mem& mem) const {
+void PIF::EepromRead(const u8* cmd, u8* res, const Mem& mem) const {
   assert(mem.saveType == SAVE_EEPROM_4k || mem.saveType == SAVE_EEPROM_16k);
   if (channel == 4) {
     u8 offset = cmd[3];
@@ -321,7 +315,7 @@ void PIF::EepromRead(u8* cmd, u8* res, const Mem& mem) const {
   }
 }
 
-void PIF::EepromWrite(u8* cmd, u8* res, const Mem& mem) const {
+void PIF::EepromWrite(const u8* cmd, u8* res, const Mem& mem) const {
   assert(mem.saveType == SAVE_EEPROM_4k || mem.saveType == SAVE_EEPROM_16k);
   if (channel == 4) {
     u8 offset = cmd[3];
diff --git a/src/backend/core/mmio/PIF.hpp b/src/backend/core/mmio/PIF.hpp
index 6b81518f..2d333696 100644
--- a/src/backend/core/mmio/PIF.hpp
+++ b/src/backend/core/mmio/PIF.hpp
@@ -102,10 +102,10 @@ struct PIF {
   void UpdateController();
   bool ReadButtons(u8*) const;
   void ControllerID(u8*) const;
-  void MempakRead(u8*, u8*) const;
+  void MempakRead(const u8*, u8*) const;
   void MempakWrite(u8*, u8*) const;
-  void EepromRead(u8*, u8*, const Mem&) const;
-  void EepromWrite(u8*, u8*, const Mem&) const;
+  void EepromRead(const u8*, u8*, const Mem&) const;
+  void EepromWrite(const u8*, u8*, const Mem&) const;
 
   bool gamepadConnected = false;
   SDL_GameController* gamepad{};
diff --git a/src/backend/core/registers/Registers.hpp b/src/backend/core/registers/Registers.hpp
index 39f17be5..a82769cf 100644
--- a/src/backend/core/registers/Registers.hpp
+++ b/src/backend/core/registers/Registers.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include <backend/core/registers/Cop0.hpp>
 #include <backend/core/registers/Cop1.hpp>
 
 namespace n64 {
diff --git a/src/frontend/imgui/Settings.cpp b/src/frontend/imgui/Settings.cpp
index cc660691..48051021 100644
--- a/src/frontend/imgui/Settings.cpp
+++ b/src/frontend/imgui/Settings.cpp
@@ -3,6 +3,7 @@
 #include <filesystem>
 #include <nfd.h>
 #include <Widgets.hpp>
+#include <Core.hpp>
 
 namespace fs = std::filesystem;
 
diff --git a/src/frontend/imgui/Settings.hpp b/src/frontend/imgui/Settings.hpp
index 5152bc36..48822d8a 100644
--- a/src/frontend/imgui/Settings.hpp
+++ b/src/frontend/imgui/Settings.hpp
@@ -1,7 +1,8 @@
 #pragma once
 #include <nlohmann/json.hpp>
-#include <Core.hpp>
+#include <common.hpp>
 
+namespace n64 { struct Core; }
 using namespace nlohmann;
 
 struct Settings {
diff --git a/src/frontend/imgui/Window.hpp b/src/frontend/imgui/Window.hpp
index 2649dd3b..429c0817 100644
--- a/src/frontend/imgui/Window.hpp
+++ b/src/frontend/imgui/Window.hpp
@@ -4,7 +4,6 @@
 #include <imgui_impl_sdl2.h>
 #include <imgui_impl_vulkan.h>
 #include <SDL2/SDL.h>
-#include <backend/Core.hpp>
 #include <vector>
 #include <frontend/imgui/Settings.hpp>