diff --git a/src/platform/qt/GDBController.h b/src/platform/qt/GDBController.h
index 5f65469e7..3de83dac4 100644
--- a/src/platform/qt/GDBController.h
+++ b/src/platform/qt/GDBController.h
@@ -4,7 +4,7 @@
 #include <QObject>
 
 extern "C" {
-#include "gdb-stub.h"
+#include "debugger/gdb-stub.h"
 }
 
 namespace QGBA {
diff --git a/src/platform/qt/GameController.cpp b/src/platform/qt/GameController.cpp
index 9dcc00d0c..fde4c5e65 100644
--- a/src/platform/qt/GameController.cpp
+++ b/src/platform/qt/GameController.cpp
@@ -3,6 +3,7 @@
 extern "C" {
 #include "gba.h"
 #include "renderers/video-software.h"
+#include "util/vfs.h"
 }
 
 using namespace QGBA;
@@ -27,7 +28,7 @@ GameController::GameController(QObject* parent)
 		.state = THREAD_INITIALIZED,
 		.debugger = 0,
 		.frameskip = 0,
-		.biosFd = -1,
+		.bios = 0,
 		.renderer = &m_renderer->d,
 		.userData = this,
 		.rewindBufferCapacity = 0
@@ -96,7 +97,7 @@ void GameController::loadGame(const QString& path) {
 
 	m_pauseAfterFrame = false;
 
-	m_threadContext.fd = m_rom->handle();
+	m_threadContext.rom = VFileFromFD(m_rom->handle());
 	m_threadContext.fname = path.toLocal8Bit().constData();
 	GBAThreadStart(&m_threadContext);
 }