Index: lib/liblzma/config.h
===================================================================
--- lib/liblzma/config.h
+++ lib/liblzma/config.h
@@ -24,10 +24,8 @@
 /* Define to 1 if you have the <byteswap.h> header file. */
 /* #undef HAVE_BYTESWAP_H */
 
-#ifndef WITHOUT_CAPSICUM
 /* Define to 1 if Capsicum is available. */
 #define HAVE_CAPSICUM 1
-#endif
 
 /* Define to 1 if the system has the type `CC_SHA256_CTX'. */
 /* #undef HAVE_CC_SHA256_CTX */
@@ -285,10 +283,8 @@
 /* Define to 1 if you have the <sys/byteorder.h> header file. */
 /* #undef HAVE_SYS_BYTEORDER_H */
 
-#ifndef WITHOUT_CAPSICUM
 /* Define to 1 if you have the <sys/capsicum.h> header file. */
 #define HAVE_SYS_CAPSICUM_H 1
-#endif
 
 /* Define to 1 if you have the <sys/endian.h> header file. */
 /* #undef HAVE_SYS_ENDIAN_H */
Index: usr.bin/bsdiff/bspatch/bspatch.c
===================================================================
--- usr.bin/bsdiff/bspatch/bspatch.c
+++ usr.bin/bsdiff/bspatch/bspatch.c
@@ -27,9 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-#ifndef WITHOUT_CAPSICUM
 #include <sys/capsicum.h>
-#endif
 
 #include <bzlib.h>
 #include <err.h>
@@ -111,9 +109,7 @@
 	off_t oldpos, newpos;
 	off_t ctrl[3];
 	off_t i, lenread, offset;
-#ifndef WITHOUT_CAPSICUM
 	cap_rights_t rights_dir, rights_ro, rights_wr;
-#endif
 
 	if (argc != 4)
 		usage();
@@ -147,7 +143,6 @@
 		err(1, "open(%s)", argv[2]);
 	atexit(exit_cleanup);
 
-#ifndef WITHOUT_CAPSICUM
 	if (cap_enter() < 0)
 		err(1, "failed to enter security sandbox");
 
@@ -164,7 +159,6 @@
 	    cap_rights_limit(dirfd, &rights_dir) < 0)
 		err(1, "cap_rights_limit() failed, could not restrict"
 		    " capabilities");
-#endif
 
 	/*
 	File format:
Index: usr.bin/xz/Makefile
===================================================================
--- usr.bin/xz/Makefile
+++ usr.bin/xz/Makefile
@@ -43,10 +43,6 @@
 		-I${LZMALIBDIR} \
 		-I${XZDIR}/common
 
-.if ${MK_CAPSICUM} == "no"
-CFLAGS+=	-DWITHOUT_CAPSICUM
-.endif
-
 LIBADD=	lzma
 
 .include <bsd.prog.mk>