diff --git a/sys/fs/umapfs/umap.h b/sys/fs/umapfs/umap.h
index 854fb8cd17ff..856aeb9365e9 100644
--- a/sys/fs/umapfs/umap.h
+++ b/sys/fs/umapfs/umap.h
@@ -80,7 +80,7 @@ extern void umap_mapids __P((struct mount *v_mount, struct ucred *credp));
 #define	MOUNTTOUMAPMOUNT(mp) ((struct umap_mount *)((mp)->mnt_data))
 #define	VTOUMAP(vp) ((struct umap_node *)(vp)->v_data)
 #define UMAPTOV(xp) ((xp)->umap_vnode)
-#ifdef DDB
+#ifdef DIAGNOSTIC
 extern struct vnode *umap_checkvp __P((struct vnode *vp, char *fil, int lno));
 #define	UMAPVPTOLOWERVP(vp) umap_checkvp((vp), __FILE__, __LINE__)
 #else
diff --git a/sys/fs/umapfs/umap_subr.c b/sys/fs/umapfs/umap_subr.c
index a4b8fbe89f50..6f08513cf552 100644
--- a/sys/fs/umapfs/umap_subr.c
+++ b/sys/fs/umapfs/umap_subr.c
@@ -38,8 +38,6 @@
  * $FreeBSD$
  */
 
-#include "opt_ddb.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
@@ -298,7 +296,7 @@ umap_node_create(mp, targetvp, newvpp)
 	return (0);
 }
 
-#ifdef DDB
+#ifdef DIAGNOSTIC
 int umap_checkvp_barrier = 1;
 struct vnode *
 umap_checkvp(vp, fil, lno)
@@ -347,7 +345,7 @@ umap_checkvp(vp, fil, lno)
 #endif
 	return (a->umap_lowervp);
 }
-#endif /* DDB */
+#endif /* DIAGNOSTIC */
 
 /* umap_mapids maps all of the ids in a credential, both user and group. */
 
diff --git a/sys/miscfs/umapfs/umap.h b/sys/miscfs/umapfs/umap.h
index 854fb8cd17ff..856aeb9365e9 100644
--- a/sys/miscfs/umapfs/umap.h
+++ b/sys/miscfs/umapfs/umap.h
@@ -80,7 +80,7 @@ extern void umap_mapids __P((struct mount *v_mount, struct ucred *credp));
 #define	MOUNTTOUMAPMOUNT(mp) ((struct umap_mount *)((mp)->mnt_data))
 #define	VTOUMAP(vp) ((struct umap_node *)(vp)->v_data)
 #define UMAPTOV(xp) ((xp)->umap_vnode)
-#ifdef DDB
+#ifdef DIAGNOSTIC
 extern struct vnode *umap_checkvp __P((struct vnode *vp, char *fil, int lno));
 #define	UMAPVPTOLOWERVP(vp) umap_checkvp((vp), __FILE__, __LINE__)
 #else
diff --git a/sys/miscfs/umapfs/umap_subr.c b/sys/miscfs/umapfs/umap_subr.c
index a4b8fbe89f50..6f08513cf552 100644
--- a/sys/miscfs/umapfs/umap_subr.c
+++ b/sys/miscfs/umapfs/umap_subr.c
@@ -38,8 +38,6 @@
  * $FreeBSD$
  */
 
-#include "opt_ddb.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
@@ -298,7 +296,7 @@ umap_node_create(mp, targetvp, newvpp)
 	return (0);
 }
 
-#ifdef DDB
+#ifdef DIAGNOSTIC
 int umap_checkvp_barrier = 1;
 struct vnode *
 umap_checkvp(vp, fil, lno)
@@ -347,7 +345,7 @@ umap_checkvp(vp, fil, lno)
 #endif
 	return (a->umap_lowervp);
 }
-#endif /* DDB */
+#endif /* DIAGNOSTIC */
 
 /* umap_mapids maps all of the ids in a credential, both user and group. */