diff --git a/build.py b/build.py
index ea37dea2..b0f92796 100644
--- a/build.py
+++ b/build.py
@@ -91,25 +91,6 @@ cxxlibrary(
         "./lib/usb/serial.cc",
         "./lib/usb/usb.cc",
         "./lib/usb/usbfinder.cc",
-        "./lib/vfs/acorndfs.cc",
-        "./lib/vfs/amigaffs.cc",
-        "./lib/vfs/appledos.cc",
-        "./lib/vfs/applesingle.cc",
-        "./lib/vfs/brother120fs.cc",
-        "./lib/vfs/cbmfs.cc",
-        "./lib/vfs/cpmfs.cc",
-        "./lib/vfs/fatfs.cc",
-        "./lib/vfs/fluxsectorinterface.cc",
-        "./lib/vfs/imagesectorinterface.cc",
-        "./lib/vfs/lif.cc",
-        "./lib/vfs/machfs.cc",
-        "./lib/vfs/microdos.cc",
-        "./lib/vfs/philefs.cc",
-        "./lib/vfs/prodos.cc",
-        "./lib/vfs/roland.cc",
-        "./lib/vfs/smaky6fs.cc",
-        "./lib/vfs/vfs.cc",
-        "./lib/vfs/zdos.cc",
         "./arch/aeslanier/decoder.cc",
         "./arch/agat/agat.cc",
         "./arch/agat/decoder.cc",
@@ -202,9 +183,6 @@ cxxlibrary(
         "lib/usb/greaseweazle.h": "./lib/usb/greaseweazle.h",
         "lib/usb/usb.h": "./lib/usb/usb.h",
         "lib/usb/usbfinder.h": "./lib/usb/usbfinder.h",
-        "lib/vfs/applesingle.h": "./lib/vfs/applesingle.h",
-        "lib/vfs/sectorinterface.h": "./lib/vfs/sectorinterface.h",
-        "lib/vfs/vfs.h": "./lib/vfs/vfs.h",
     },
     deps=[
         "+fl2_proto_lib",
diff --git a/lib/vfs/build.py b/lib/vfs/build.py
new file mode 100644
index 00000000..878276a8
--- /dev/null
+++ b/lib/vfs/build.py
@@ -0,0 +1,31 @@
+from build.c import cxxlibrary
+
+cxxlibrary(
+    name="vfs",
+    srcs=[
+        "./acorndfs.cc",
+        "./amigaffs.cc",
+        "./appledos.cc",
+        "./applesingle.cc",
+        "./brother120fs.cc",
+        "./cbmfs.cc",
+        "./cpmfs.cc",
+        "./fatfs.cc",
+        "./fluxsectorinterface.cc",
+        "./imagesectorinterface.cc",
+        "./lif.cc",
+        "./machfs.cc",
+        "./microdos.cc",
+        "./philefs.cc",
+        "./prodos.cc",
+        "./roland.cc",
+        "./smaky6fs.cc",
+        "./vfs.cc",
+        "./zdos.cc",
+    ],
+    hdrs={
+        "lib/vfs/applesingle.h": "./applesingle.h",
+        "lib/vfs/sectorinterface.h": "./sectorinterface.h",
+        "lib/vfs/vfs.h": "./vfs.h",
+    },
+    deps=["+lib"])
diff --git a/src/build.py b/src/build.py
index 9d7593c5..04361113 100644
--- a/src/build.py
+++ b/src/build.py
@@ -43,6 +43,7 @@ cxxprogram(
         "dep/stb",
         "+lib",
         "lib/core",
+        "lib/vfs",
         "lib+config_proto_lib",
         "src/formats",
     ],
diff --git a/src/gui/build.py b/src/gui/build.py
index a117a20d..449fbc7c 100644
--- a/src/gui/build.py
+++ b/src/gui/build.py
@@ -63,6 +63,7 @@ cxxprogram(
         "extras+icons",
         "+lib",
         "lib/core",
+        "lib/vfs",
         "lib+config_proto_lib",
         "src/formats",
         "src/gui/drivetypes",
diff --git a/tests/build.py b/tests/build.py
index ccd5f1b6..76ac35ae 100644
--- a/tests/build.py
+++ b/tests/build.py
@@ -100,7 +100,8 @@ export(
                     "lib+config_proto_lib",
                     "src/formats",
                 ]
-                + ([".+test_proto_lib"] if n == "options" else []),
+                + ([".+test_proto_lib"] if n == "options" else [])
+                + (["lib/vfs"] if n in {"cpmfs", "applesingle", "vfs"} else []),
             ),
         )
         for n in tests