diff --git a/sys/lib/libsa/ffsv1.c b/sys/lib/libsa/ffsv1.c
index c526191ec5e1..c3197c669d16 100644
--- a/sys/lib/libsa/ffsv1.c
+++ b/sys/lib/libsa/ffsv1.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ffsv1.c,v 1.8 2021/05/27 06:54:44 mrg Exp $ */
+/* $NetBSD: ffsv1.c,v 1.9 2022/04/24 06:52:59 mlelstv Exp $ */
 
 #define LIBSA_FFSv1
 
@@ -19,8 +19,7 @@
 
 #define FS_MAGIC FS_UFS1_MAGIC
 
-#if 0
-#define	FSMOD	"wapbl/ufs/ffs"
-#endif
+/* #define	FSMOD	"wapbl/ufs/ffs" */
+#define	FSMOD	NULL
 
 #include "ufs.c"
diff --git a/sys/lib/libsa/ffsv2.c b/sys/lib/libsa/ffsv2.c
index 8e1fa7aae045..90b7cae30a12 100644
--- a/sys/lib/libsa/ffsv2.c
+++ b/sys/lib/libsa/ffsv2.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ffsv2.c,v 1.8 2021/05/27 06:54:44 mrg Exp $ */
+/* $NetBSD: ffsv2.c,v 1.9 2022/04/24 06:52:59 mlelstv Exp $ */
 
 #define LIBSA_FFSv2
 
@@ -19,8 +19,7 @@
 
 #define FS_MAGIC FS_UFS2_MAGIC
 
-#if 0
-#define	FSMOD	"wapbl/ufs/ffs"
-#endif
+/* #define	FSMOD	"wapbl/ufs/ffs" */
+#define	FSMOD	NULL
 
 #include "ufs.c"
diff --git a/sys/lib/libsa/files.c b/sys/lib/libsa/files.c
index ab216b1d91cb..e72a322cd387 100644
--- a/sys/lib/libsa/files.c
+++ b/sys/lib/libsa/files.c
@@ -1,4 +1,4 @@
-/* $NetBSD: files.c,v 1.1 2002/03/15 13:23:34 simonb Exp $ */
+/* $NetBSD: files.c,v 1.2 2022/04/24 06:52:59 mlelstv Exp $ */
 
 /*
  *	files.c:
@@ -10,3 +10,4 @@
 #include "stand.h"
 
 struct open_file files[SOPEN_MAX];
+const char *fsmod = NULL;	/* file system module name to load */
diff --git a/sys/lib/libsa/globals.c b/sys/lib/libsa/globals.c
index ea23ca74f262..84fd2d8ea260 100644
--- a/sys/lib/libsa/globals.c
+++ b/sys/lib/libsa/globals.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: globals.c,v 1.11 2014/03/29 14:30:16 jakllsch Exp $	*/
+/*	$NetBSD: globals.c,v 1.12 2022/04/24 06:52:59 mlelstv Exp $	*/
 
 /*
  *	globals.c:
@@ -20,7 +20,6 @@ u_char	bcea[ETHER_ADDR_LEN] = BA;	/* broadcast ethernet address */
 char	rootpath[FNAME_SIZE];		/* root mount path */
 char	bootfile[FNAME_SIZE];		/* bootp says to boot this */
 char	hostname[FNAME_SIZE];		/* our hostname */
-const char	*fsmod = NULL;		/* file system module name to load */
 struct	in_addr myip;			/* my ip address */
 struct	in_addr rootip;			/* root ip address */
 struct	in_addr gateip;			/* swap ip address */
diff --git a/sys/lib/libsa/ufs.c b/sys/lib/libsa/ufs.c
index 8a8a328a96ac..efde7592f2c8 100644
--- a/sys/lib/libsa/ufs.c
+++ b/sys/lib/libsa/ufs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ufs.c,v 1.82 2022/04/24 06:48:15 mlelstv Exp $	*/
+/*	$NetBSD: ufs.c,v 1.83 2022/04/24 06:52:59 mlelstv Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -857,9 +857,11 @@ ufs_open(const char *path, struct open_file *f)
 out:
 	if (rc)
 		ufs_close(f);
-#ifdef FSMOD		/* Only defined for lfs */
 	else
+#ifdef FSMOD
 		fsmod = FSMOD;
+#else
+		fsmod = NULL;
 #endif
 	return rc;
 }