diff --git a/src/gba/renderers/thread-proxy.c b/src/gba/renderers/thread-proxy.c
index aac1e47cd..b080f91b2 100644
--- a/src/gba/renderers/thread-proxy.c
+++ b/src/gba/renderers/thread-proxy.c
@@ -6,6 +6,7 @@
 #include "thread-proxy.h"
 
 #include "gba/io.h"
+#include "gba/renderers/tile-cache.h"
 
 #include "util/memory.h"
 
@@ -125,7 +126,7 @@ void GBAVideoThreadProxyRendererDeinit(struct GBAVideoRenderer* renderer) {
 
 static bool _writeData(struct GBAVideoThreadProxyRenderer* proxyRenderer, void* data, size_t length) {
 	while (!RingFIFOWrite(&proxyRenderer->dirtyQueue, data, length)) {
-		mLOG(GBA_VIDEO, WARN, "Can't write 0x%z bytes. Proxy thread asleep?", length);
+		mLOG(GBA_VIDEO, WARN, "Can't write 0x%zu bytes. Proxy thread asleep?", length);
 		mLOG(GBA_VIDEO, DEBUG, "Queue status: read: %p, write: %p", proxyRenderer->dirtyQueue.readPtr, proxyRenderer->dirtyQueue.writePtr);
 		MutexLock(&proxyRenderer->mutex);
 		if (proxyRenderer->threadState == PROXY_THREAD_STOPPED) {
diff --git a/src/gba/renderers/video-software.c b/src/gba/renderers/video-software.c
index e9ee5358f..6d3666e98 100644
--- a/src/gba/renderers/video-software.c
+++ b/src/gba/renderers/video-software.c
@@ -7,6 +7,7 @@
 
 #include "gba/gba.h"
 #include "gba/io.h"
+#include "gba/renderers/tile-cache.h"
 
 #include "util/arm-algo.h"
 #include "util/memory.h"
diff --git a/src/platform/test/fuzz-main.c b/src/platform/test/fuzz-main.c
index 201addb59..c3cd2862b 100644
--- a/src/platform/test/fuzz-main.c
+++ b/src/platform/test/fuzz-main.c
@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "core/config.h"
 #include "core/core.h"
+#include "core/serialize.h"
 #include "gba/core.h"
 #include "gba/gba.h"
 #include "gba/serialize.h"
diff --git a/src/platform/test/perf-main.c b/src/platform/test/perf-main.c
index 872e03af3..1deca58b4 100644
--- a/src/platform/test/perf-main.c
+++ b/src/platform/test/perf-main.c
@@ -4,10 +4,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "core/config.h"
+#include "core/serialize.h"
 #include "gba/core.h"
 #include "gba/gba.h"
 #include "gba/renderers/video-software.h"
-#include "gba/serialize.h"
 
 #include "feature/commandline.h"
 #include "util/socket.h"