diff --git a/configure.py b/configure.py
index 6c05b404..0b81b4bf 100644
--- a/configure.py
+++ b/configure.py
@@ -365,8 +365,9 @@ config.libs = [
             Object(Matching, "egg/core/eggDisplay.cpp"),
             Object(Matching, "egg/core/eggColorFader.cpp"),
             Object(Matching, "egg/core/eggAsyncDisplay.cpp"),
+            Object(Matching, "egg/core/eggXfb.cpp"),
             Object(Matching, "egg/core/eggVideo.cpp"),
-            Object(NonMatching, "egg/core/eggXfb.cpp"),
+            Object(Matching, "egg/core/eggXfb.cpp"),
             Object(NonMatching, "egg/core/eggXfbManager.cpp"),
             Object(NonMatching, "egg/core/eggGraphicsFifo.cpp"),
             Object(NonMatching, "egg/core/eggController.cpp"),
diff --git a/src/egg/core/eggXfb.cpp b/src/egg/core/eggXfb.cpp
new file mode 100644
index 00000000..4347689f
--- /dev/null
+++ b/src/egg/core/eggXfb.cpp
@@ -0,0 +1,32 @@
+#include <egg/core/eggSystem.h>
+#include <egg/core/eggVideo.h>
+#include <egg/core/eggXfb.h>
+
+
+namespace EGG {
+
+/* 804989e0 */ void Xfb::init(u16 width, u16 height, Heap *heap) {
+    mWidth = width;
+    mHeight = height;
+    u32 size = calcBufferSize(width, height);
+    if (heap == nullptr) {
+        heap = Heap::sCurrentHeap;
+    }
+
+    u8 *buf = new (heap, 32) u8[size];
+    mBuffer = buf;
+    mPrev = nullptr;
+    mNext = nullptr;
+    mState = XFB_UNPROCESSED;
+}
+
+/* 80498a60 */ Xfb::Xfb(Heap *heap) {
+    Video *video = BaseSystem::mConfigData->getVideo();
+    init(video->pRenderMode->fbWidth, video->pRenderMode->xfbHeight, heap);
+}
+
+/* 80498ad0 */ u32 Xfb::calcBufferSize(u16 width, u16 height) {
+    return ((width + 0xf) & 0xfff0) * height * 2;
+}
+
+} // namespace EGG